|
@@ -12,29 +12,27 @@
|
|
|
|
|
|
/* Minimum kernel alignment, as a power of two */
|
|
/* Minimum kernel alignment, as a power of two */
|
|
#ifdef CONFIG_X86_64
|
|
#ifdef CONFIG_X86_64
|
|
-#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
|
|
|
|
|
|
+# define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
|
|
#else
|
|
#else
|
|
-#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER)
|
|
|
|
|
|
+# define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER)
|
|
#endif
|
|
#endif
|
|
#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
|
|
#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
|
|
|
|
|
|
#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \
|
|
#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \
|
|
(CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN)
|
|
(CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN)
|
|
-#error "Invalid value for CONFIG_PHYSICAL_ALIGN"
|
|
|
|
|
|
+# error "Invalid value for CONFIG_PHYSICAL_ALIGN"
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
-#define BOOT_HEAP_SIZE 0x400000
|
|
|
|
|
|
+# define BOOT_HEAP_SIZE 0x400000
|
|
#else /* !CONFIG_KERNEL_BZIP2 */
|
|
#else /* !CONFIG_KERNEL_BZIP2 */
|
|
-
|
|
|
|
-#define BOOT_HEAP_SIZE 0x10000
|
|
|
|
-
|
|
|
|
-#endif /* !CONFIG_KERNEL_BZIP2 */
|
|
|
|
|
|
+# define BOOT_HEAP_SIZE 0x10000
|
|
|
|
+#endif
|
|
|
|
|
|
#ifdef CONFIG_X86_64
|
|
#ifdef CONFIG_X86_64
|
|
-#define BOOT_STACK_SIZE 0x4000
|
|
|
|
-#else
|
|
|
|
-#define BOOT_STACK_SIZE 0x1000
|
|
|
|
|
|
+# define BOOT_STACK_SIZE 0x4000
|
|
|
|
+#else /* !CONFIG_X86_64 */
|
|
|
|
+# define BOOT_STACK_SIZE 0x1000
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#endif /* _ASM_X86_BOOT_H */
|
|
#endif /* _ASM_X86_BOOT_H */
|