From 935871e4d6ae17e9d669ff429cbc7f9a8fecb4e3 Mon Sep 17 00:00:00 2001 From: Randy Vinson Date: Sat, 11 Jan 2003 13:29:29 +1100 Subject: PPC32: Explicitly control store-gathering on MPC10x host bridges. This change alters the behavior of the "MCP10x Store Gathering Enable" option. Previously, selecting this option would enable store gathering, while not selecting the option would leave the firmware-provided state. In short, there was no way to disable store gathering if the firmware had left it enabled. This caused problems with the Adaptec 2940U2W when run in 8240 and 8245 Sandpoint systems. The new code will disable store gathering unless the user requests it. --- include/asm-ppc/mpc10x.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/asm-ppc/mpc10x.h b/include/asm-ppc/mpc10x.h index 1d3a64f06d46..d2676d8f8088 100644 --- a/include/asm-ppc/mpc10x.h +++ b/include/asm-ppc/mpc10x.h @@ -164,5 +164,6 @@ int mpc10x_bridge_init(struct pci_controller *hose, uint phys_eumb_base); unsigned long mpc10x_get_mem_size(uint mem_map); int mpc10x_enable_store_gathering(struct pci_controller *hose); +int mpc10x_disable_store_gathering(struct pci_controller *hose); #endif /* __PPC_KERNEL_MPC10X_H */ -- cgit v1.2.3 From 9e7f90ddcedbe01fbb63c022ce61ef8c9a10cd8b Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 14 Jan 2003 20:22:38 +1100 Subject: PPC32: Change struct free_pte_ctx to struct mmu_gather. A couple of occurrences of struct free_pte_ctx in include/asm-ppc/tlb.h got missed in akpm's patch - this fixes them. --- include/asm-ppc/tlb.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/asm-ppc/tlb.h b/include/asm-ppc/tlb.h index b4375599b610..2c142c5d8584 100644 --- a/include/asm-ppc/tlb.h +++ b/include/asm-ppc/tlb.h @@ -21,8 +21,8 @@ #ifdef CONFIG_PPC_STD_MMU /* Classic PPC with hash-table based MMU... */ -struct free_pte_ctx; -extern void tlb_flush(struct free_pte_ctx *tlb); +struct mmu_gather; +extern void tlb_flush(struct mmu_gather *tlb); /* Get the generic bits... */ #include @@ -44,10 +44,6 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, #else /* Embedded PPC with software-loaded TLB, very simple... */ -struct flush_tlb_arch { }; - -#define tlb_init_arch(tlb, full_flush) do { } while (0) -#define tlb_finish_arch(tlb) do { } while (0) #define tlb_start_vma(tlb, vma) do { } while (0) #define tlb_end_vma(tlb, vma) do { } while (0) #define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0) -- cgit v1.2.3