diff options
Diffstat (limited to 'drivers/char/mem.c')
-rw-r--r-- | drivers/char/mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 30eff80fed6f..fba76fb55abf 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -43,7 +43,7 @@ static inline int uncached_access(struct file *file, unsigned long addr) | |||
43 | { | 43 | { |
44 | #if defined(CONFIG_IA64) | 44 | #if defined(CONFIG_IA64) |
45 | /* | 45 | /* |
46 | * On ia64, we ignore O_SYNC because we cannot tolerate memory attribute aliases. | 46 | * On ia64, we ignore O_DSYNC because we cannot tolerate memory attribute aliases. |
47 | */ | 47 | */ |
48 | return !(efi_mem_attributes(addr) & EFI_MEMORY_WB); | 48 | return !(efi_mem_attributes(addr) & EFI_MEMORY_WB); |
49 | #elif defined(CONFIG_MIPS) | 49 | #elif defined(CONFIG_MIPS) |
@@ -56,9 +56,9 @@ static inline int uncached_access(struct file *file, unsigned long addr) | |||
56 | #else | 56 | #else |
57 | /* | 57 | /* |
58 | * Accessing memory above the top the kernel knows about or through a file pointer | 58 | * Accessing memory above the top the kernel knows about or through a file pointer |
59 | * that was marked O_SYNC will be done non-cached. | 59 | * that was marked O_DSYNC will be done non-cached. |
60 | */ | 60 | */ |
61 | if (file->f_flags & O_SYNC) | 61 | if (file->f_flags & O_DSYNC) |
62 | return 1; | 62 | return 1; |
63 | return addr >= __pa(high_memory); | 63 | return addr >= __pa(high_memory); |
64 | #endif | 64 | #endif |