diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/bootparam.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/include/asm/bootparam.h')
| -rw-r--r-- | arch/x86/include/asm/bootparam.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 8e6218550e77..e020d88ec02d 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | /* setup data types */ | 12 | /* setup data types */ |
| 13 | #define SETUP_NONE 0 | 13 | #define SETUP_NONE 0 |
| 14 | #define SETUP_E820_EXT 1 | 14 | #define SETUP_E820_EXT 1 |
| 15 | #define SETUP_DTB 2 | ||
| 15 | 16 | ||
| 16 | /* extensible setup data list node */ | 17 | /* extensible setup data list node */ |
| 17 | struct setup_data { | 18 | struct setup_data { |
| @@ -124,6 +125,7 @@ enum { | |||
| 124 | X86_SUBARCH_LGUEST, | 125 | X86_SUBARCH_LGUEST, |
| 125 | X86_SUBARCH_XEN, | 126 | X86_SUBARCH_XEN, |
| 126 | X86_SUBARCH_MRST, | 127 | X86_SUBARCH_MRST, |
| 128 | X86_SUBARCH_CE4100, | ||
| 127 | X86_NR_SUBARCHS, | 129 | X86_NR_SUBARCHS, |
| 128 | }; | 130 | }; |
| 129 | 131 | ||