--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -336,6 +336,8 @@ static struct cfi_fixup fixup_table[] =
+@@ -336,6 +336,8 @@ static struct cfi_fixup fixup_table[] =
static void cfi_fixup_major_minor(struct cfi_private *cfi,
struct cfi_pri_amdstd *extp)
{
if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
extp->MajorVersion == '0')
extp->MajorVersion = '1';
-@@ -366,6 +368,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -366,6 +368,9 @@ struct mtd_info *cfi_cmdset_0002(struct
mtd->name = map->name;
mtd->writesize = 1;
if (cfi->cfi_mode==CFI_MODE_CFI){
unsigned char bootloc;
/*
-@@ -384,16 +389,24 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -384,16 +389,24 @@ struct mtd_info *cfi_cmdset_0002(struct
cfi_fixup_major_minor(cfi, extp);
#include <linux/kallsyms.h>
#include <linux/notifier.h>
#include <linux/module.h>
-@@ -74,6 +75,7 @@
+@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt,
dump_stack();
#endif
/*
* If we have crashed and we have a crash kernel loaded let it handle
* everything else.
-@@ -337,6 +339,7 @@
+@@ -337,6 +339,7 @@ void oops_exit(void)
{
do_oops_enter_exit();
print_oops_end_marker();
#include <asm/uaccess.h>
-@@ -1322,3 +1323,121 @@
+@@ -1322,3 +1323,121 @@ bool printk_timed_ratelimit(unsigned lon
}
EXPORT_SYMBOL(printk_timed_ratelimit);
#endif
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -723,6 +723,9 @@
+@@ -723,6 +723,9 @@ config NET_NS
Allow user space to create what appear to be multiple instances
of the network stack.
depends on BROKEN || !FRV
--- a/kernel/Makefile
+++ b/kernel/Makefile
-@@ -95,6 +95,7 @@
+@@ -95,6 +95,7 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace/
obj-$(CONFIG_TRACING) += trace/
obj-$(CONFIG_SMP) += sched_cpupri.o
obj-$(CONFIG_SLOW_WORK) += slow-work.o
#include <asm/bug.h>
#include <asm/io.h>
-@@ -151,6 +152,7 @@
+@@ -151,6 +152,7 @@ static unsigned long __init free_all_boo
if (!bdata->node_bootmem_map)
return 0;