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/microblaze/include | |
| 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/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/asm/memblock.h (renamed from arch/microblaze/include/asm/lmb.h) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/lmb.h b/arch/microblaze/include/asm/memblock.h index a0a0a929c293..f9c2fa331d2a 100644 --- a/arch/microblaze/include/asm/lmb.h +++ b/arch/microblaze/include/asm/memblock.h | |||
| @@ -6,12 +6,12 @@ | |||
| 6 | * for more details. | 6 | * for more details. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef _ASM_MICROBLAZE_LMB_H | 9 | #ifndef _ASM_MICROBLAZE_MEMBLOCK_H |
| 10 | #define _ASM_MICROBLAZE_LMB_H | 10 | #define _ASM_MICROBLAZE_MEMBLOCK_H |
| 11 | 11 | ||
| 12 | /* LMB limit is OFF */ | 12 | /* MEMBLOCK limit is OFF */ |
| 13 | #define LMB_REAL_LIMIT 0xFFFFFFFF | 13 | #define MEMBLOCK_REAL_LIMIT 0xFFFFFFFF |
| 14 | 14 | ||
| 15 | #endif /* _ASM_MICROBLAZE_LMB_H */ | 15 | #endif /* _ASM_MICROBLAZE_MEMBLOCK_H */ |
| 16 | 16 | ||
| 17 | 17 | ||