diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /include/asm-x86_64 | |
parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
download | blackbird-op-linux-02f693c7118f6be9e677070eb630c1f3a654cdd3.tar.gz blackbird-op-linux-02f693c7118f6be9e677070eb630c1f3a654cdd3.zip |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/param.h | 3 | ||||
-rw-r--r-- | include/asm-x86_64/rwlock.h | 2 | ||||
-rw-r--r-- | include/asm-x86_64/topology.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-x86_64/param.h b/include/asm-x86_64/param.h index 40b11937180d..5956b23b57c2 100644 --- a/include/asm-x86_64/param.h +++ b/include/asm-x86_64/param.h @@ -1,9 +1,8 @@ -#include <linux/config.h> - #ifndef _ASMx86_64_PARAM_H #define _ASMx86_64_PARAM_H #ifdef __KERNEL__ +# include <linux/config.h> # define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks */ #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ diff --git a/include/asm-x86_64/rwlock.h b/include/asm-x86_64/rwlock.h index 8a78a4ace53c..9942cc393064 100644 --- a/include/asm-x86_64/rwlock.h +++ b/include/asm-x86_64/rwlock.h @@ -64,7 +64,7 @@ ::"a" (rw) : "memory") #define __build_write_lock_const(rw, helper) \ - asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \ + asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \ "jnz 2f\n" \ "1:\n" \ LOCK_SECTION_START("") \ diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index d39ebd5263ed..7d82bc56b9fa 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h @@ -23,7 +23,7 @@ extern int __node_distance(int, int); #define cpu_to_node(cpu) (cpu_to_node[cpu]) #define parent_node(node) (node) -#define node_to_first_cpu(node) (__ffs(node_to_cpumask[node])) +#define node_to_first_cpu(node) (first_cpu(node_to_cpumask[node])) #define node_to_cpumask(node) (node_to_cpumask[node]) #define pcibus_to_node(bus) ((long)(bus->sysdata)) #define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus)); |