diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-21 15:43:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-21 15:43:06 -0400 |
| commit | 9dcdbf7a33d9018ac5d45debcf261be648bdd56a (patch) | |
| tree | bbcc1a018f11ff76cd7ce174ef3ffe2c02da07ee /arch/sh/include/asm | |
| parent | cc5edb0eb9ce892b530e34a5d110382483587942 (diff) | |
| parent | cd5b8f8755a89a57fc8c408d284b8b613f090345 (diff) | |
Merge branch 'linus' into perf/core
Merge reason: Pick up the latest perf fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/lmb.h | 6 | ||||
| -rw-r--r-- | arch/sh/include/asm/memblock.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/include/asm/lmb.h b/arch/sh/include/asm/lmb.h deleted file mode 100644 index 9b437f657ffa..000000000000 --- a/arch/sh/include/asm/lmb.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __ASM_SH_LMB_H | ||
| 2 | #define __ASM_SH_LMB_H | ||
| 3 | |||
| 4 | #define LMB_REAL_LIMIT 0 | ||
| 5 | |||
| 6 | #endif /* __ASM_SH_LMB_H */ | ||
diff --git a/arch/sh/include/asm/memblock.h b/arch/sh/include/asm/memblock.h new file mode 100644 index 000000000000..dfe683b88075 --- /dev/null +++ b/arch/sh/include/asm/memblock.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH_MEMBLOCK_H | ||
| 2 | #define __ASM_SH_MEMBLOCK_H | ||
| 3 | |||
| 4 | #define MEMBLOCK_REAL_LIMIT 0 | ||
| 5 | |||
| 6 | #endif /* __ASM_SH_MEMBLOCK_H */ | ||