diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
commit | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (patch) | |
tree | d6cec15baa1ddfee108ef77b315dfdea5e3fa71c /arch/powerpc/kernel/sys_ppc32.c | |
parent | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (diff) | |
parent | 3b212db9217d02e623eaa12f41c9b5f8c6a99535 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/sys_ppc32.c')
-rw-r--r-- | arch/powerpc/kernel/sys_ppc32.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 0ee44be4ab73..475249dc2350 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) |