diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-12 16:27:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-12 16:27:32 -0800 |
| commit | 4cf1480012040da0631eb9ef777f3bbca625f9dd (patch) | |
| tree | 7517bfcff1f4b04c36329fdbcc6a962c9f42a597 /include | |
| parent | 3f81804dba6d3f3340434518c993a5bb64b318c7 (diff) | |
| parent | 1d81a92559e5c4ace3605a19b21ca71dabb7fc90 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/mpc10x.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/tlb.h | 8 |
2 files changed, 3 insertions, 6 deletions
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 */ 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 <asm-generic/tlb.h> @@ -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) |