diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-01-09 18:36:14 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-10 00:25:30 -0500 |
commit | f8cd32167d96680af19c3ef5fb01d4460be89982 (patch) | |
tree | 7eedfa5d357391a55a66c6bd301959471891b9a2 | |
parent | 13b8a272297b29870d5bf5f8db7a381dd9e82382 (diff) |
[PATCH] powerpc: remove compat_sys_pciconfig_*
Matthew Wilcox wondered why we need these functions. We don't.
Remove them and just use the "normal" versions.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/sys_ppc32.c | 24 | ||||
-rw-r--r-- | arch/powerpc/kernel/systbl.S | 6 |
2 files changed, 3 insertions, 27 deletions
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 9c921d1c4084..9b6d965fb13e 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c | |||
@@ -552,30 +552,6 @@ asmlinkage long compat_sys_sched_rr_get_interval(u32 pid, struct compat_timespec | |||
552 | return ret; | 552 | return ret; |
553 | } | 553 | } |
554 | 554 | ||
555 | asmlinkage int compat_sys_pciconfig_read(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf) | ||
556 | { | ||
557 | return sys_pciconfig_read((unsigned long) bus, | ||
558 | (unsigned long) dfn, | ||
559 | (unsigned long) off, | ||
560 | (unsigned long) len, | ||
561 | compat_ptr(ubuf)); | ||
562 | } | ||
563 | |||
564 | asmlinkage int compat_sys_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf) | ||
565 | { | ||
566 | return sys_pciconfig_write((unsigned long) bus, | ||
567 | (unsigned long) dfn, | ||
568 | (unsigned long) off, | ||
569 | (unsigned long) len, | ||
570 | compat_ptr(ubuf)); | ||
571 | } | ||
572 | |||
573 | asmlinkage int compat_sys_pciconfig_iobase(u32 which, u32 in_bus, u32 in_devfn) | ||
574 | { | ||
575 | return sys_pciconfig_iobase(which, in_bus, in_devfn); | ||
576 | } | ||
577 | |||
578 | |||
579 | /* Note: it is necessary to treat mode as an unsigned int, | 555 | /* Note: it is necessary to treat mode as an unsigned int, |
580 | * with the corresponding cast to a signed int to insure that the | 556 | * with the corresponding cast to a signed int to insure that the |
581 | * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode) | 557 | * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode) |
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 65463a1076e8..c3ae74b1bf2d 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S | |||
@@ -239,9 +239,9 @@ SYS32ONLY(ftruncate64) | |||
239 | SYSX(sys_ni_syscall,sys_stat64,sys_stat64) | 239 | SYSX(sys_ni_syscall,sys_stat64,sys_stat64) |
240 | SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64) | 240 | SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64) |
241 | SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64) | 241 | SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64) |
242 | COMPAT_SYS(pciconfig_read) | 242 | SYSCALL(pciconfig_read) |
243 | COMPAT_SYS(pciconfig_write) | 243 | SYSCALL(pciconfig_write) |
244 | COMPAT_SYS(pciconfig_iobase) | 244 | SYSCALL(pciconfig_iobase) |
245 | SYSCALL(ni_syscall) | 245 | SYSCALL(ni_syscall) |
246 | SYSCALL(getdents64) | 246 | SYSCALL(getdents64) |
247 | SYSCALL(pivot_root) | 247 | SYSCALL(pivot_root) |