aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-18 00:19:41 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-18 00:19:41 -0400
commit77f543cb467c44960bafa6c91f5af75919d693e4 (patch)
treeeebf9705cb750be7db8ced19d58bd6c4db0e573e /arch
parent81e7009ea46c951860b8716ee427ff4f54dd26fc (diff)
powerpc: Fix various compile errors with ARCH=ppc, ppc64 and powerpc
This makes ppc use the syscalls.c from arch/powerpc/kernel, exports copy_and_flush from head_32.S for use by prom_init.c (ARCH=powerpc), and consolidates the sys_fadvise64_64 implementations for 32-bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Makefile1
-rw-r--r--arch/powerpc/kernel/Makefile10
-rw-r--r--arch/powerpc/kernel/head_32.S2
-rw-r--r--arch/powerpc/kernel/sys_ppc32.c7
-rw-r--r--arch/powerpc/kernel/syscalls.c7
-rw-r--r--arch/powerpc/kernel/systbl.S2
-rw-r--r--arch/ppc/kernel/Makefile2
-rw-r--r--arch/ppc64/kernel/misc.S2
8 files changed, 16 insertions, 17 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index a5f2eb5f89ce..29cda0732703 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -121,7 +121,6 @@ head-$(CONFIG_4xx) := arch/powerpc/kernel/head_4xx.o
121head-$(CONFIG_44x) := arch/powerpc/kernel/head_44x.o 121head-$(CONFIG_44x) := arch/powerpc/kernel/head_44x.o
122head-$(CONFIG_FSL_BOOKE) := arch/powerpc/kernel/head_fsl_booke.o 122head-$(CONFIG_FSL_BOOKE) := arch/powerpc/kernel/head_fsl_booke.o
123 123
124head-$(CONFIG_6xx) += arch/powerpc/kernel/idle_6xx.o
125head-$(CONFIG_PPC64) += arch/powerpc/kernel/entry_64.o 124head-$(CONFIG_PPC64) += arch/powerpc/kernel/entry_64.o
126head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o 125head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o
127 126
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 043ddd09521d..01b6d630edc9 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -10,7 +10,8 @@ CFLAGS_prom_init.o += -fPIC
10CFLAGS_btext.o += -fPIC 10CFLAGS_btext.o += -fPIC
11endif 11endif
12 12
13obj-y := semaphore.o cputable.o ptrace.o signal_32.o 13obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
14 signal_32.o
14obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o 15obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o
15obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o 16obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
16obj-$(CONFIG_POWER4) += idle_power4.o 17obj-$(CONFIG_POWER4) += idle_power4.o
@@ -24,14 +25,13 @@ extra-$(CONFIG_40x) := head_4xx.o
24extra-$(CONFIG_44x) := head_44x.o 25extra-$(CONFIG_44x) := head_44x.o
25extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o 26extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
26extra-$(CONFIG_8xx) := head_8xx.o 27extra-$(CONFIG_8xx) := head_8xx.o
27extra-$(CONFIG_6xx) += idle_6xx.o
28extra-$(CONFIG_PPC64) += entry_64.o 28extra-$(CONFIG_PPC64) += entry_64.o
29extra-$(CONFIG_PPC_FPU) += fpu.o 29extra-$(CONFIG_PPC_FPU) += fpu.o
30extra-y += vmlinux.lds 30extra-y += vmlinux.lds
31 31
32obj-y += process.o init_task.o \ 32obj-y += process.o init_task.o \
33 prom.o systbl.o traps.o syscalls.o 33 prom.o systbl.o traps.o
34obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o 34obj-$(CONFIG_PPC32) += entry_32.o idle_6xx.o setup_32.o misc_32.o
35obj-$(CONFIG_PPC64) += setup_64.o misc_64.o 35obj-$(CONFIG_PPC64) += setup_64.o misc_64.o
36obj-$(CONFIG_PPC_OF) += prom_init.o 36obj-$(CONFIG_PPC_OF) += prom_init.o
37obj-$(CONFIG_MODULES) += ppc_ksyms.o 37obj-$(CONFIG_MODULES) += ppc_ksyms.o
@@ -44,7 +44,7 @@ endif
44 44
45else 45else
46# stuff used from here for ARCH=ppc or ARCH=ppc64 46# stuff used from here for ARCH=ppc or ARCH=ppc64
47obj-$(CONFIG_PPC64) += traps.o process.o init_task.o syscalls.o 47obj-$(CONFIG_PPC64) += traps.o process.o init_task.o
48 48
49fpux-$(CONFIG_PPC32) += fpu.o 49fpux-$(CONFIG_PPC32) += fpu.o
50extra-$(CONFIG_PPC_FPU) += $(fpux-y) 50extra-$(CONFIG_PPC_FPU) += $(fpux-y)
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 7ef9a3e3002b..cd51fe585fcd 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -831,7 +831,7 @@ relocate_kernel:
831 * r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset 831 * r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset
832 * on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5. 832 * on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5.
833 */ 833 */
834copy_and_flush: 834_GLOBAL(copy_and_flush)
835 addi r5,r5,-4 835 addi r5,r5,-4
836 addi r6,r6,-4 836 addi r6,r6,-4
8374: li r0,L1_CACHE_BYTES/4 8374: li r0,L1_CACHE_BYTES/4
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 9babe055356e..2f1e41a82876 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -1069,13 +1069,6 @@ long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,
1069 advice); 1069 advice);
1070} 1070}
1071 1071
1072long ppc32_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low,
1073 u32 len_high, u32 len_low)
1074{
1075 return sys_fadvise64(fd, (u64)offset_high << 32 | offset_low,
1076 (u64)len_high << 32 | len_low, advice);
1077}
1078
1079long ppc32_timer_create(clockid_t clock, 1072long ppc32_timer_create(clockid_t clock,
1080 struct compat_sigevent __user *ev32, 1073 struct compat_sigevent __user *ev32,
1081 timer_t __user *timer_id) 1074 timer_t __user *timer_id)
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 3e3a4f67de96..7a23721365a6 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -336,6 +336,13 @@ time_t sys64_time(time_t __user * tloc)
336} 336}
337#endif 337#endif
338 338
339long ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low,
340 u32 len_high, u32 len_low)
341{
342 return sys_fadvise64(fd, (u64)offset_high << 32 | offset_low,
343 (u64)len_high << 32 | len_low, advice);
344}
345
339void do_show_syscall(unsigned long r3, unsigned long r4, unsigned long r5, 346void do_show_syscall(unsigned long r3, unsigned long r4, unsigned long r5,
340 unsigned long r6, unsigned long r7, unsigned long r8, 347 unsigned long r6, unsigned long r7, unsigned long r8,
341 struct pt_regs *regs) 348 struct pt_regs *regs)
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index b364141ec01c..1b807f79d5da 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -297,7 +297,7 @@ SYSCALL32(tgkill)
297SYSCALL32(utimes) 297SYSCALL32(utimes)
298COMPAT_SYS(statfs64) 298COMPAT_SYS(statfs64)
299COMPAT_SYS(fstatfs64) 299COMPAT_SYS(fstatfs64)
300SYSX(sys_ni_syscall, ppc32_fadvise64_64, sys_fadvise64_64) 300SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
301PPC_SYS(rtas) 301PPC_SYS(rtas)
302OLDSYS(debug_setcontext) 302OLDSYS(debug_setcontext)
303SYSCALL(ni_syscall) 303SYSCALL(ni_syscall)
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index c178397c50af..5a742c7b0509 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -14,7 +14,7 @@ extra-y += vmlinux.lds
14 14
15obj-y := entry.o traps.o irq.o idle.o time.o misc.o \ 15obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
16 process.o align.o \ 16 process.o align.o \
17 syscalls.o setup.o \ 17 setup.o \
18 ppc_htab.o perfmon.o 18 ppc_htab.o perfmon.o
19obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o 19obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
20obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o 20obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index eb407c429bb0..755d73f222e2 100644
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -1175,7 +1175,7 @@ _GLOBAL(sys_call_table32)
1175 .llong .sys32_utimes 1175 .llong .sys32_utimes
1176 .llong .compat_sys_statfs64 1176 .llong .compat_sys_statfs64
1177 .llong .compat_sys_fstatfs64 1177 .llong .compat_sys_fstatfs64
1178 .llong .ppc32_fadvise64_64 /* 32bit only fadvise64_64 */ 1178 .llong .ppc_fadvise64_64 /* 32bit only fadvise64_64 */
1179 .llong .ppc_rtas /* 255 */ 1179 .llong .ppc_rtas /* 255 */
1180 .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */ 1180 .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */
1181 .llong .sys_ni_syscall /* 257 reserved for vserver */ 1181 .llong .sys_ni_syscall /* 257 reserved for vserver */