diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:50:02 -0400 |
| commit | 7a309490da98981558a07183786201f02a6341e2 (patch) | |
| tree | 204bfd3bc344dbb02be0b1eac29b956f6722e661 /arch/m32r/include/asm/segment.h | |
| parent | 9a8709d44139748fe2e0ab56d20d8c384c8b65ad (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/apic
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m32r/include/asm/segment.h')
| -rw-r--r-- | arch/m32r/include/asm/segment.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/segment.h b/arch/m32r/include/asm/segment.h new file mode 100644 index 000000000000..42b11aeb3249 --- /dev/null +++ b/arch/m32r/include/asm/segment.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | #ifndef _ASM_M32R_SEGMENT_H | ||
| 2 | #define _ASM_M32R_SEGMENT_H | ||
| 3 | |||
| 4 | #define __KERNEL_CS 0x10 | ||
| 5 | #define __KERNEL_DS 0x18 | ||
| 6 | |||
| 7 | #define __USER_CS 0x23 | ||
| 8 | #define __USER_DS 0x2B | ||
| 9 | |||
| 10 | #endif /* _ASM_M32R_SEGMENT_H */ | ||