diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:13:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:13:11 -0800 |
| commit | a5222049f3e26c21ecd65bfcc9b666d4c813933b (patch) | |
| tree | f4474d66f0150b8dba8675b373a90d5509af9d75 /include/asm-arm | |
| parent | 7054ec7f86cada917626c05fe461abccca816d3b (diff) | |
| parent | d9db950cfa3d674ee834d980c329efdf8e4a0568 (diff) | |
| download | kernel-crypto-a5222049f3e26c21ecd65bfcc9b666d4c813933b.tar.gz kernel-crypto-a5222049f3e26c21ecd65bfcc9b666d4c813933b.tar.xz kernel-crypto-a5222049f3e26c21ecd65bfcc9b666d4c813933b.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/smp.h | 5 | ||||
| -rw-r--r-- | include/asm-arm/unistd.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h index 5a72e50ca9f..fe45f7f6122 100644 --- a/include/asm-arm/smp.h +++ b/include/asm-arm/smp.h @@ -42,6 +42,11 @@ extern void show_ipi_list(struct seq_file *p); asmlinkage void do_IPI(struct pt_regs *regs); /* + * Setup the SMP cpu_possible_map + */ +extern void smp_init_cpus(void); + +/* * Move global data into per-processor storage. */ extern void smp_store_cpu_info(unsigned int cpuid); diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index 77430d6178a..8f331bbd39a 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h @@ -309,7 +309,7 @@ #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) #define __NR_waitid (__NR_SYSCALL_BASE+280) -#if 0 /* reserve these for un-muxing socketcall */ +#if defined(__ARM_EABI__) /* reserve these for un-muxing socketcall */ #define __NR_socket (__NR_SYSCALL_BASE+281) #define __NR_bind (__NR_SYSCALL_BASE+282) #define __NR_connect (__NR_SYSCALL_BASE+283) @@ -329,7 +329,7 @@ #define __NR_recvmsg (__NR_SYSCALL_BASE+297) #endif -#if 0 /* reserve these for un-muxing ipc */ +#if defined(__ARM_EABI__) /* reserve these for un-muxing ipc */ #define __NR_semop (__NR_SYSCALL_BASE+298) #define __NR_semget (__NR_SYSCALL_BASE+299) #define __NR_semctl (__NR_SYSCALL_BASE+300) @@ -347,7 +347,7 @@ #define __NR_request_key (__NR_SYSCALL_BASE+310) #define __NR_keyctl (__NR_SYSCALL_BASE+311) -#if 0 /* reserved for un-muxing ipc */ +#if defined(__ARM_EABI__) /* reserved for un-muxing ipc */ #define __NR_semtimedop (__NR_SYSCALL_BASE+312) #endif |