diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/sh/include/asm/page.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/sh/include/asm/page.h')
| -rw-r--r-- | arch/sh/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h index c4e0b3d472b..822d6084195 100644 --- a/arch/sh/include/asm/page.h +++ b/arch/sh/include/asm/page.h | |||
| @@ -186,7 +186,7 @@ typedef struct page *pgtable_t; | |||
| 186 | /* | 186 | /* |
| 187 | * While BYTES_PER_WORD == 4 on the current sh64 ABI, GCC will still | 187 | * While BYTES_PER_WORD == 4 on the current sh64 ABI, GCC will still |
| 188 | * happily generate {ld/st}.q pairs, requiring us to have 8-byte | 188 | * happily generate {ld/st}.q pairs, requiring us to have 8-byte |
| 189 | * alignment to avoid traps. The kmalloc alignment is gauranteed by | 189 | * alignment to avoid traps. The kmalloc alignment is guaranteed by |
| 190 | * virtue of L1_CACHE_BYTES, requiring this to only be special cased | 190 | * virtue of L1_CACHE_BYTES, requiring this to only be special cased |
| 191 | * for slab caches. | 191 | * for slab caches. |
| 192 | */ | 192 | */ |