remove merged patches

4 files changed, 19 insertions, 252 deletions

diff --git a/README b/README
index 5292099..e69de29 100644
--- a/README
+++ b/README
@@ -1,89 +0,0 @@
-kill sysdev
-===========
-
-All x86 stuff converted and sysdev removed:
-  01-core-support.patch
-  02-cpu.patch
-  03-memory.patch
-  04-rtmutex.patch
-  05-clocksource.patch
-  06-ibm-rtl.patch
-  07-edac.patch
-  08-xen.patch
-
-Non-x86 TODO (mostly trivial string replace):
-  $ git grep -l -w -e sys_device --or -e sysdev_class --or -e sysdev_attribute | sort -u
-  arch/arm/kernel/leds.c
-  arch/arm/mach-exynos/cpu.c
-  arch/arm/mach-exynos/pm.c
-  arch/arm/mach-s3c2410/cpu-freq.c
-  arch/arm/mach-s3c2410/dma.c
-  arch/arm/mach-s3c2410/include/mach/dma.h
-  arch/arm/mach-s3c2410/pll.c
-  arch/arm/mach-s3c2410/pm.c
-  arch/arm/mach-s3c2410/s3c2410.c
-  arch/arm/mach-s3c2412/cpu-freq.c
-  arch/arm/mach-s3c2412/dma.c
-  arch/arm/mach-s3c2412/irq.c
-  arch/arm/mach-s3c2412/pm.c
-  arch/arm/mach-s3c2412/s3c2412.c
-  arch/arm/mach-s3c2416/irq.c
-  arch/arm/mach-s3c2416/pm.c
-  arch/arm/mach-s3c2416/s3c2416.c
-  arch/arm/mach-s3c2440/clock.c
-  arch/arm/mach-s3c2440/dma.c
-  arch/arm/mach-s3c2440/irq.c
-  arch/arm/mach-s3c2440/s3c2440.c
-  arch/arm/mach-s3c2440/s3c2440-cpufreq.c
-  arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
-  arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
-  arch/arm/mach-s3c2440/s3c2442.c
-  arch/arm/mach-s3c2440/s3c244x.c
-  arch/arm/mach-s3c2440/s3c244x-clock.c
-  arch/arm/mach-s3c2440/s3c244x-irq.c
-  arch/arm/mach-s3c2443/dma.c
-  arch/arm/mach-s3c2443/irq.c
-  arch/arm/mach-s3c2443/s3c2443.c
-  arch/arm/mach-s3c64xx/cpu.c
-  arch/arm/mach-s3c64xx/dma.c
-  arch/arm/mach-s3c64xx/s3c6400.c
-  arch/arm/mach-s3c64xx/s3c6410.c
-  arch/arm/mach-s5p64x0/cpu.c
-  arch/arm/mach-s5p64x0/pm.c
-  arch/arm/mach-s5pc100/cpu.c
-  arch/arm/mach-s5pv210/cpu.c
-  arch/arm/mach-s5pv210/pm.c
-  arch/arm/plat-samsung/include/plat/cpu.h
-  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
-  arch/arm/plat-samsung/include/plat/pm.h
-  arch/avr32/kernel/cpu.c
-  arch/ia64/kernel/err_inject.c
-  arch/ia64/kernel/topology.c
-  arch/m68k/platform/coldfire/gpio.c
-  arch/mips/txx9/generic/7segled.c
-  arch/mips/txx9/generic/setup.c
-  arch/powerpc/include/asm/spu.h
-  arch/powerpc/include/asm/topology.h
-  arch/powerpc/kernel/cacheinfo.c
-  arch/powerpc/kernel/sysfs.c
-  arch/powerpc/mm/numa.c
-  arch/powerpc/platforms/cell/cbe_thermal.c
-  arch/powerpc/platforms/cell/spu_base.c
-  arch/powerpc/platforms/pseries/cmm.c
-  arch/powerpc/platforms/pseries/pseries_energy.c
-  arch/powerpc/platforms/pseries/suspend.c
-  arch/powerpc/sysdev/ppc4xx_cpm.c
-  arch/powerpc/sysdev/qe_lib/qe_ic.c
-  arch/s390/kernel/smp.c
-  arch/s390/kernel/time.c
-  arch/s390/kernel/topology.c
-  arch/sh/drivers/dma/dma-sysfs.c
-  arch/sh/include/asm/dma.h
-  arch/sh/kernel/cpu/sh4/sq.c
-  arch/sparc/kernel/sysfs.c
-  arch/tile/kernel/sysfs.c
-  drivers/s390/char/sclp_config.c
-  drivers/sh/intc/core.c
-  drivers/sh/intc/internals.h
-  drivers/sh/intc/userimask.c
-
diff --git a/modinfo.patch b/modinfo.patch
deleted file mode 100644
index 0af33c3..0000000
--- a/modinfo.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Kay Sievers <kay.sievers@vrfy.org>
-Subject: modules: sysfs - export taint, address, size
-
-Recent tools do not use /proc to retrieve module information. A few values
-are currently missing from sysfs.
-
-Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
----
- kernel/module.c |   89 +++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 62 insertions(+), 27 deletions(-)
-
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -849,6 +849,26 @@ out:
- 	return ret;
- }
- 
-+static size_t module_flags_taint(struct module *mod, char *buf)
-+{
-+	size_t l = 0;
-+
-+	if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))
-+		buf[l++] = 'P';
-+	else if (mod->taints & (1 << TAINT_OOT_MODULE))
-+		buf[l++] = 'O';
-+	if (mod->taints & (1 << TAINT_FORCED_MODULE))
-+		buf[l++] = 'F';
-+	if (mod->taints & (1 << TAINT_CRAP))
-+		buf[l++] = 'C';
-+	/*
-+	 * TAINT_FORCED_RMMOD: could be added.
-+	 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
-+	 * apply to modules.
-+	 */
-+	return l;
-+}
-+
- static inline void print_unload_info(struct seq_file *m, struct module *mod)
- {
- 	struct module_use *use;
-@@ -907,10 +927,8 @@ static ssize_t show_refcnt(struct module
- 	return sprintf(buffer, "%u\n", module_refcount(mk->mod));
- }
- 
--static struct module_attribute refcnt = {
--	.attr = { .name = "refcnt", .mode = 0444 },
--	.show = show_refcnt,
--};
-+static struct module_attribute refcnt =
-+	__ATTR(refcnt, 0444, show_refcnt, NULL);
- 
- void module_put(struct module *module)
- {
-@@ -970,10 +988,8 @@ static ssize_t show_initstate(struct mod
- 	return sprintf(buffer, "%s\n", state);
- }
- 
--static struct module_attribute initstate = {
--	.attr = { .name = "initstate", .mode = 0444 },
--	.show = show_initstate,
--};
-+static struct module_attribute module_initstate =
-+	__ATTR(initstate, 0444, show_initstate, NULL);
- 
- static ssize_t store_uevent(struct module_attribute *mattr,
- 			    struct module_kobject *mk,
-@@ -986,16 +1002,48 @@ static ssize_t store_uevent(struct modul
- 	return count;
- }
- 
--struct module_attribute module_uevent = {
--	.attr = { .name = "uevent", .mode = 0200 },
--	.store = store_uevent,
--};
-+struct module_attribute module_uevent =
-+	__ATTR(uevent, 0200, NULL, store_uevent);
-+
-+static ssize_t show_address(struct module_attribute *mattr,
-+			    struct module_kobject *mk, char *buffer)
-+{
-+	return sprintf(buffer, "0x%pK\n", mk->mod->module_core);
-+}
-+
-+struct module_attribute module_address =
-+	__ATTR(address, 0444, show_address, NULL);
-+
-+static ssize_t show_size(struct module_attribute *mattr,
-+			struct module_kobject *mk, char *buffer)
-+{
-+	return sprintf(buffer, "%u\n", mk->mod->init_size + mk->mod->core_size);
-+}
-+
-+struct module_attribute module_size =
-+	__ATTR(size, 0444, show_size, NULL);
-+
-+static ssize_t show_taint(struct module_attribute *mattr,
-+			  struct module_kobject *mk, char *buffer)
-+{
-+	size_t l;
-+
-+	l = module_flags_taint(mk->mod, buffer);
-+	buffer[l++] = '\n';
-+	return l;
-+}
-+
-+struct module_attribute module_taint =
-+	__ATTR(taint, 0444, show_taint, NULL);
- 
- static struct module_attribute *modinfo_attrs[] = {
- 	&modinfo_version,
- 	&modinfo_srcversion,
--	&initstate,
-+	&module_initstate,
- 	&module_uevent,
-+	&module_address,
-+	&module_size,
-+	&module_taint,
- #ifdef CONFIG_MODULE_UNLOAD
- 	&refcnt,
- #endif
-@@ -3256,20 +3304,7 @@ static char *module_flags(struct module
- 	    mod->state == MODULE_STATE_GOING ||
- 	    mod->state == MODULE_STATE_COMING) {
- 		buf[bx++] = '(';
--		if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))
--			buf[bx++] = 'P';
--		else if (mod->taints & (1 << TAINT_OOT_MODULE))
--			buf[bx++] = 'O';
--		if (mod->taints & (1 << TAINT_FORCED_MODULE))
--			buf[bx++] = 'F';
--		if (mod->taints & (1 << TAINT_CRAP))
--			buf[bx++] = 'C';
--		/*
--		 * TAINT_FORCED_RMMOD: could be added.
--		 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
--		 * apply to modules.
--		 */
--
-+		bx += module_flags_taint(mod, buf + bx);
- 		/* Show a - for module-is-being-unloaded */
- 		if (mod->state == MODULE_STATE_GOING)
- 			buf[bx++] = '-';
diff --git a/prctl-child_reaper.patch b/prctl-child_reaper.patch
index 20ca356..c202bf0 100644
--- a/prctl-child_reaper.patch
+++ b/prctl-child_reaper.patch
@@ -71,12 +71,12 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 
 --- a/include/linux/prctl.h
 +++ b/include/linux/prctl.h
-@@ -102,4 +102,7 @@
+@@ -114,4 +114,7 @@
+ # define PR_SET_MM_START_BRK		6
+ # define PR_SET_MM_BRK			7
  
- #define PR_MCE_KILL_GET 34
- 
-+#define PR_SET_CHILD_SUBREAPER 35
-+#define PR_GET_CHILD_SUBREAPER 36
++#define PR_SET_CHILD_SUBREAPER 36
++#define PR_GET_CHILD_SUBREAPER 37
 +
  #endif /* _LINUX_PRCTL_H */
 --- a/include/linux/sched.h
@@ -102,7 +102,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
-@@ -687,11 +687,12 @@ static void exit_mm(struct task_struct *
+@@ -686,11 +686,12 @@ static void exit_mm(struct task_struct *
  }
  
  /*
@@ -120,7 +120,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
   */
  static struct task_struct *find_new_reaper(struct task_struct *father)
  	__releases(&tasklist_lock)
-@@ -722,6 +723,23 @@ static struct task_struct *find_new_reap
+@@ -721,6 +722,23 @@ static struct task_struct *find_new_reap
  		 * forget_original_parent() must move them somewhere.
  		 */
  		pid_ns->child_reaper = init_pid_ns.child_reaper;
@@ -146,7 +146,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  	return pid_ns->child_reaper;
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -979,6 +979,9 @@ static int copy_signal(unsigned long clo
+@@ -982,6 +982,9 @@ static int copy_signal(unsigned long clo
  	sig->oom_score_adj = current->signal->oom_score_adj;
  	sig->oom_score_adj_min = current->signal->oom_score_adj_min;
  
@@ -158,18 +158,18 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  	return 0;
 --- a/kernel/sys.c
 +++ b/kernel/sys.c
-@@ -1841,6 +1841,14 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
- 			else
- 				error = PR_MCE_KILL_DEFAULT;
+@@ -1962,6 +1962,14 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+ 		case PR_SET_MM:
+ 			error = prctl_set_mm(arg2, arg3, arg4, arg5);
  			break;
-+		case PR_SET_CHILD_SUBREAPER:
-+			me->signal->is_child_subreaper = !!arg2;
-+			error = 0;
-+			break;
-+		case PR_GET_CHILD_SUBREAPER:
-+			error = put_user(me->signal->is_child_subreaper,
-+					 (int __user *) arg2);
-+			break;
+++		case PR_SET_CHILD_SUBREAPER:
+++			me->signal->is_child_subreaper = !!arg2;
+++			error = 0;
+++			break;
+++		case PR_GET_CHILD_SUBREAPER:
+++			error = put_user(me->signal->is_child_subreaper,
+++					 (int __user *) arg2);
+++			break;
  		default:
  			error = -EINVAL;
  			break;
diff --git a/series b/series
index 4fe42a5..46d7fe0 100644
--- a/series
+++ b/series
@@ -1,2 +1 @@
 prctl-child_reaper.patch
-modinfo.patch