diff options
author | Paul Mackerras <paulus@samba.org> | 2008-01-31 03:25:51 +0300 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 03:25:51 +0300 |
commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /sound/pci/intel8x0.c | |
parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
download | linux-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.xz |
Merge branch 'linux-2.6'
Diffstat (limited to 'sound/pci/intel8x0.c')
-rw-r--r-- | sound/pci/intel8x0.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index b4a38a3d855b..4bb97646a67a 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -711,11 +711,13 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich static void fill_nocache(void *buf, int size, int nocache) { size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; - change_page_attr(virt_to_page(buf), size, nocache ? PAGE_KERNEL_NOCACHE : PAGE_KERNEL); - global_flush_tlb(); + if (nocache) + set_pages_uc(virt_to_page(buf), size); + else + set_pages_wb(virt_to_page(buf), size); } #else -#define fill_nocache(buf,size,nocache) +#define fill_nocache(buf, size, nocache) do { ; } while (0) #endif /* |