diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 10:11:38 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 10:11:38 +1100 |
| commit | 1263965f298af611d4992165242202eb194db1c1 (patch) | |
| tree | 625cbd9be60127a70619833e4e5f25a349d228da /arch/powerpc/kernel | |
| parent | 5006d1aae813727cc77cc56cca9e90ef748650ce (diff) | |
| parent | c0da99d5f7b0349cb11f970b3283c0d57beb5ec9 (diff) | |
| download | linux-1263965f298af611d4992165242202eb194db1c1.tar.gz linux-1263965f298af611d4992165242202eb194db1c1.tar.bz2 linux-1263965f298af611d4992165242202eb194db1c1.zip | |
Merge commit 'kumar/kumar-next'
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: bne 2f /* Bail if permission mismach */ -#ifdef CONFIG_PTE_64BIT - lwz r13,0(r12) -#endif - /* Jump to common TLB load point */ b finish_tlb_load 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); static int pci_bus_count; static void -fixup_hide_host_resource_fsl(struct pci_dev* dev) +fixup_hide_host_resource_fsl(struct pci_dev *dev) { int i, class = dev->class >> 8; - if ((class == PCI_CLASS_PROCESSOR_POWERPC) && + if ((class == PCI_CLASS_PROCESSOR_POWERPC || + class == PCI_CLASS_BRIDGE_OTHER) && (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) && (dev->bus->parent == NULL)) { for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { |