diff --git a/[refs] b/[refs] index 7dc19b1984be..f7ac4b457b9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be274eeaf20b4c7155242645d5e2c48b023e609b +refs/heads/master: 4c7aa6c3b25ef96bc1b723238041195e3d8bf047 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index fd2fa7a7ec52..1f0f7b60995e 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -774,7 +774,8 @@ config CRASH_DUMP For more details see Documentation/kdump/kdump.txt config RELOCATABLE - bool "Build a relocatable kernel" + bool "Build a relocatable kernel(EXPERIMENTAL)" + depends on EXPERIMENTAL help This build a kernel image that retains relocation information so it can be loaded someplace besides the default 1MB.