aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 13:37:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 13:37:40 -0400
commite16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch)
tree640f0f56f2ea676647af4eb42d32fa56be2ee549 /arch/alpha
parent7fd23a24717a327a66f3c32d11a20a2f169c824f (diff)
parente6e8dd5055a974935af1398c8648d4a9359b0ecb (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits) doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore Update cpuset info & webiste for cgroups dcdbas: force SMI to happen when expected arch/arm/Kconfig: remove one to many l's in the word. asm-generic/user.h: Fix spelling in comment drm: fix printk typo 'sracth' Remove one to many n's in a word Documentation/filesystems/romfs.txt: fixing link to genromfs drivers:scsi Change printk typo initate -> initiate serial, pch uart: Remove duplicate inclusion of linux/pci.h header fs/eventpoll.c: fix spelling mm: Fix out-of-date comments which refers non-existent functions drm: Fix printk typo 'failled' coh901318.c: Change initate to initiate. mbox-db5500.c Change initate to initiate. edac: correct i82975x error-info reported edac: correct i82975x mci initialisation edac: correct commented info fs: update comments to point correct document target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c ... Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/include/asm/cacheflush.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/cacheflush.h b/arch/alpha/include/asm/cacheflush.h
index 012f1243b1c1..a9cb6aa447aa 100644
--- a/arch/alpha/include/asm/cacheflush.h
+++ b/arch/alpha/include/asm/cacheflush.h
@@ -63,7 +63,7 @@ extern void flush_icache_user_range(struct vm_area_struct *vma,
63 struct page *page, unsigned long addr, int len); 63 struct page *page, unsigned long addr, int len);
64#endif 64#endif
65 65
66/* This is used only in do_no_page and do_swap_page. */ 66/* This is used only in __do_fault and do_swap_page. */
67#define flush_icache_page(vma, page) \ 67#define flush_icache_page(vma, page) \
68 flush_icache_user_range((vma), (page), 0, 0) 68 flush_icache_user_range((vma), (page), 0, 0)
69 69