diff options
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r-- | arch/ppc/kernel/pci.c | 6 | ||||
-rw-r--r-- | arch/ppc/kernel/traps.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 5e723c4c2571..c2ec13bea006 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c | |||
@@ -633,12 +633,6 @@ void pcibios_make_OF_bus_map(void) | |||
633 | { | 633 | { |
634 | } | 634 | } |
635 | 635 | ||
636 | /* Add sysfs properties */ | ||
637 | void pcibios_add_platform_entries(struct pci_dev *pdev) | ||
638 | { | ||
639 | } | ||
640 | |||
641 | |||
642 | static int __init | 636 | static int __init |
643 | pcibios_init(void) | 637 | pcibios_init(void) |
644 | { | 638 | { |
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index aea100be52c8..0eaef7c8378b 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
@@ -619,7 +619,7 @@ void program_check_exception(struct pt_regs *regs) | |||
619 | return; | 619 | return; |
620 | 620 | ||
621 | if (!(regs->msr & MSR_PR) && /* not user-mode */ | 621 | if (!(regs->msr & MSR_PR) && /* not user-mode */ |
622 | report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) { | 622 | report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) { |
623 | regs->nip += 4; | 623 | regs->nip += 4; |
624 | return; | 624 | return; |
625 | } | 625 | } |