diff options
| author | Luck, Tony <tony.luck@intel.com> | 2012-03-29 13:35:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:16:06 -0700 |
| commit | 93f378883cecb9dcb2cf5b51d9d24175906659da (patch) | |
| tree | 42e794ea347b67b1bdc238aa61efb198e48e0340 | |
| parent | 55a320308902f7a0746569ee57eeb3f254e6ed16 (diff) | |
| download | linux-93f378883cecb9dcb2cf5b51d9d24175906659da.tar.bz2 | |
Fix ia64 build errors (fallout from system.h disintegration)
Fix this build error on ia64:
In file included from include/linux/sched.h:92,
from arch/ia64/kernel/asm-offsets.c:9:
include/linux/llist.h:59:25: error: asm/cmpxchg.h: No such file or directory
make[1]: *** [arch/ia64/kernel/asm-offsets.s] Error 1
Right now we don't seem to need any actual contents for the
asm/cmpxchg.h to make the build work ... so leave the migration of
xchg() and cmpxchg() to this new header file for a future patch.
Also process.c needs <asm/switch_to.h> (for definition of pfm_syst_info).
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/ia64/include/asm/cmpxchg.h | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/process.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/cmpxchg.h b/arch/ia64/include/asm/cmpxchg.h new file mode 100644 index 000000000000..507c66c77600 --- /dev/null +++ b/arch/ia64/include/asm/cmpxchg.h @@ -0,0 +1 @@ +/* Future home of xchg() and cmpxchg() */ diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 9dc52b63fc87..ce74e143aea3 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -38,6 +38,7 @@ #include <asm/pgalloc.h> #include <asm/processor.h> #include <asm/sal.h> +#include <asm/switch_to.h> #include <asm/tlbflush.h> #include <asm/uaccess.h> #include <asm/unwind.h> |