dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

arch/sparc/kernel/sys_sparc_64.c: s/COLOUR/COLOR/ 

Consistently spell this word across arch/sparc/mm and arch/sparc/kernel.

Acked-by: David Miller <davem@davemloft.net>
Cc: Michel Lespinasse <walken@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2012-12-11 16:02:29 -08:00 committed by Linus Torvalds
parent 2aea28b975
commit 748ba883ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc/kernel/sys_sparc_64.c
View File

@ -75,7 +75,7 @@ static inline int invalid_64bit_range(unsigned long addr, unsigned long len)
* the spitfire/niagara VA-hole.
*/
static inline unsigned long COLOUR_ALIGN(unsigned long addr,
static inline unsigned long COLOR_ALIGN(unsigned long addr,
unsigned long pgoff)
{
unsigned long base = (addr+SHMLBA-1)&~(SHMLBA-1);
@ -113,7 +113,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
addr = COLOR_ALIGN(addr, pgoff);
else
addr = PAGE_ALIGN(addr);
@ -176,7 +176,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* requesting a specific address */
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
addr = COLOR_ALIGN(addr, pgoff);
else
addr = PAGE_ALIGN(addr);