diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-12 16:28:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-12 16:28:27 -0800 |
| commit | 8e517818bb290752c7be4240ee82390e342b2f53 (patch) | |
| tree | 46ccfadcc875a507533ed8b55883f1196ef10f74 /include | |
| parent | a1940218b7e96140c7c8d0e364519c5fe7415862 (diff) | |
| parent | 980e2c9bdf806c254187b543fce3e0e3d976c69a (diff) | |
Merge http://ppc.bkbits.net/for-linus-ppc64
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 | ||||
| -rw-r--r-- | include/asm-sparc64/compat.h | 13 | ||||
| -rw-r--r-- | include/asm-sparc64/statfs.h | 14 |
4 files changed, 16 insertions, 20 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) diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h index bf8792ec92bb..6e6111e478fe 100644 --- a/include/asm-sparc64/compat.h +++ b/include/asm-sparc64/compat.h @@ -64,4 +64,17 @@ struct compat_flock { short __unused; }; +struct compat_statfs { + int f_type; + int f_bsize; + int f_blocks; + int f_bfree; + int f_bavail; + int f_files; + int f_ffree; + compat_fsid_t f_fsid; + int f_namelen; /* SunOS ignores this field. */ + int f_spare[6]; +}; + #endif /* _ASM_SPARC64_COMPAT_H */ diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h index 116ae1814702..3866255b84de 100644 --- a/include/asm-sparc64/statfs.h +++ b/include/asm-sparc64/statfs.h @@ -5,25 +5,11 @@ #ifndef __KERNEL_STRICT_NAMES #include <linux/types.h> -#include <linux/compat.h> /* for compat_fsid_t */ typedef __kernel_fsid_t fsid_t; #endif -struct statfs32 { - int f_type; - int f_bsize; - int f_blocks; - int f_bfree; - int f_bavail; - int f_files; - int f_ffree; - compat_fsid_t f_fsid; - int f_namelen; /* SunOS ignores this field. */ - int f_spare[6]; -}; - struct statfs { long f_type; long f_bsize; |