diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/char/mem.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 1b49e6e1b..828675d47 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -179,8 +179,11 @@ static inline int noncached_address(unsigned long addr) * caching for the high addresses through the KEN pin, but * we maintain the tradition of paranoia in this code. */ - return !(boot_cpu_data.x86_capability & X86_FEATURE_MTRR) - && addr >= __pa(high_memory); + return !( test_bit(X86_FEATURE_MTRR, &boot_cpu_data.x86_capability) || + test_bit(X86_FEATURE_K6_MTRR, &boot_cpu_data.x86_capability) || + test_bit(X86_FEATURE_CYRIX_ARR, &boot_cpu_data.x86_capability) || + test_bit(X86_FEATURE_CENTAUR_MCR, &boot_cpu_data.x86_capability) ) + && addr >= __pa(high_memory); #else return addr >= __pa(high_memory); #endif |