diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /include/asm-ppc | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/byteorder.h | 6 | ||||
| -rw-r--r-- | include/asm-ppc/init.h | 21 | ||||
| -rw-r--r-- | include/asm-ppc/pgtable.h | 1 |
3 files changed, 1 insertions, 27 deletions
diff --git a/include/asm-ppc/byteorder.h b/include/asm-ppc/byteorder.h index 0fdd67844..02454f6cf 100644 --- a/include/asm-ppc/byteorder.h +++ b/include/asm-ppc/byteorder.h @@ -38,11 +38,7 @@ extern __inline__ void st_le32(volatile unsigned *addr, const unsigned val) /* alas, egcs sounds like it has a bug in this code that doesn't use the inline asm correctly, and can cause file corruption. Until I hear that it's fixed, I can live without the extra speed. I hope. */ -#if !(__GNUC__ >= 2 && __GNUC_MINOR__ >= 90) #if 0 -# define __arch_swab16(x) ld_le16(&x) -# define __arch_swab32(x) ld_le32(&x) -#else static __inline__ __const__ __u16 ___arch__swab16(__u16 value) { __u16 result; @@ -68,8 +64,6 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 value) #define __arch__swab16(x) ___arch__swab16(x) #endif /* 0 */ -#endif - /* The same, but returns converted value from the location pointer by addr. */ #define __arch__swab16p(addr) ld_le16(addr) #define __arch__swab32p(addr) ld_le32(addr) diff --git a/include/asm-ppc/init.h b/include/asm-ppc/init.h index a25f6015e..00a1c79cc 100644 --- a/include/asm-ppc/init.h +++ b/include/asm-ppc/init.h @@ -3,7 +3,6 @@ #include <linux/init.h> -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 90 /* egcs */ #define __pmac __attribute__ ((__section__ (".text.pmac"))) #define __pmacdata __attribute__ ((__section__ (".data.pmac"))) #define __pmacfunc(__argpmac) \ @@ -35,24 +34,4 @@ __argopenfirmware __openfirmware; \ __argopenfirmware -#else /* not egcs */ - -#define __pmac -#define __pmacdata -#define __pmacfunc(x) x - -#define __prep -#define __prepdata -#define __prepfunc(x) x - -#define __apus -#define __apusdata -#define __apusfunc(x) x - -#define __openfirmware -#define __openfirmwaredata -#define __openfirmwarefunc(x) x - -#endif /* egcs */ - #endif /* _PPC_INIT_H */ diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h index c5a90fba0..27c89e13e 100644 --- a/include/asm-ppc/pgtable.h +++ b/include/asm-ppc/pgtable.h @@ -488,6 +488,7 @@ extern void kernel_set_cachemode (unsigned long address, unsigned long size, #define io_remap_page_range remap_page_range +#include <asm-generic/pgtable.h> #endif __ASSEMBLY__ #endif /* _PPC_PGTABLE_H */ |