diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 13:45:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 13:45:59 +0200 |
| commit | 91d0322bef047e2916b3e52741411bffc63929cb (patch) | |
| tree | 44c4fd13cc17755a6db8a3d70cffb86e57a838dc /arch/powerpc/kernel/io.c | |
| parent | 065cb3dfe24978651caedfa54da585388ad15dde (diff) | |
| parent | 50515af207d410c9f228380e529c56f43c3de0bd (diff) | |
| download | kernel-crypto-91d0322bef047e2916b3e52741411bffc63929cb.tar.gz kernel-crypto-91d0322bef047e2916b3e52741411bffc63929cb.tar.xz kernel-crypto-91d0322bef047e2916b3e52741411bffc63929cb.zip | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/powerpc/kernel/io.c')
| -rw-r--r-- | arch/powerpc/kernel/io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c index e31aca9208e..1882bf419fa 100644 --- a/arch/powerpc/kernel/io.c +++ b/arch/powerpc/kernel/io.c @@ -120,7 +120,8 @@ EXPORT_SYMBOL(_outsl_ns); #define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0) -void _memset_io(volatile void __iomem *addr, int c, unsigned long n) +notrace void +_memset_io(volatile void __iomem *addr, int c, unsigned long n) { void *p = (void __force *)addr; u32 lc = c; |