diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index 18c0093f9323..590304c24dad 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
@@ -656,10 +656,6 @@ interrupt_base: | |||
656 | 656 | ||
657 | bne 2f /* Bail if permission mismach */ | 657 | bne 2f /* Bail if permission mismach */ |
658 | 658 | ||
659 | #ifdef CONFIG_PTE_64BIT | ||
660 | lwz r13,0(r12) | ||
661 | #endif | ||
662 | |||
663 | /* Jump to common TLB load point */ | 659 | /* Jump to common TLB load point */ |
664 | b finish_tlb_load | 660 | b finish_tlb_load |
665 | 661 | ||
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 174b77ee18ff..a848c6360bd1 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -54,11 +54,12 @@ LIST_HEAD(hose_list); | |||
54 | static int pci_bus_count; | 54 | static int pci_bus_count; |
55 | 55 | ||
56 | static void | 56 | static void |
57 | fixup_hide_host_resource_fsl(struct pci_dev* dev) | 57 | fixup_hide_host_resource_fsl(struct pci_dev *dev) |
58 | { | 58 | { |
59 | int i, class = dev->class >> 8; | 59 | int i, class = dev->class >> 8; |
60 | 60 | ||
61 | if ((class == PCI_CLASS_PROCESSOR_POWERPC) && | 61 | if ((class == PCI_CLASS_PROCESSOR_POWERPC || |
62 | class == PCI_CLASS_BRIDGE_OTHER) && | ||
62 | (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) && | 63 | (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) && |
63 | (dev->bus->parent == NULL)) { | 64 | (dev->bus->parent == NULL)) { |
64 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { | 65 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { |