Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 318c8932 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more fixes from Andrew Morton:
 "3 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kcov: add missing #include <linux/sched.h>
  radix tree test suite: fix compilation
  zram: restrict add/remove attributes to root only
parents ea5a9eff 166ad0e1

drivers/block/zram/zram_drv.c

+7 −1
Original line number Diff line number Diff line
@@ -1413,8 +1413,14 @@ static ssize_t hot_remove_store(struct class *class, 
	return ret ? ret : count;

}



/*

 * NOTE: hot_add attribute is not the usual read-only sysfs attribute. In a

 * sense that reading from this file does alter the state of your system -- it

 * creates a new un-initialized zram device and returns back this device's

 * device_id (or an error code if it fails to create a new device).

 */

static struct class_attribute zram_control_class_attrs[] = {

	__ATTR_RO(hot_add),

	__ATTR(hot_add, 0400, hot_add_show, NULL),

	__ATTR_WO(hot_remove),

	__ATTR_NULL,

};

kernel/kcov.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/fs.h>

#include <linux/mm.h>

#include <linux/printk.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/vmalloc.h>

lib/radix-tree.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/percpu.h>

#include <linux/slab.h>

#include <linux/kmemleak.h>

#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/string.h>

#include <linux/bitops.h>

tools/testing/radix-tree/linux/cpu.h

+1 −21
Original line number Diff line number Diff line 


#define hotcpu_notifier(a, b)



#define CPU_ONLINE		0x0002 /* CPU (unsigned)v is up */

#define CPU_UP_PREPARE		0x0003 /* CPU (unsigned)v coming up */

#define CPU_UP_CANCELED		0x0004 /* CPU (unsigned)v NOT coming up */

#define CPU_DOWN_PREPARE	0x0005 /* CPU (unsigned)v going down */

#define CPU_DOWN_FAILED		0x0006 /* CPU (unsigned)v NOT going down */

#define CPU_DEAD		0x0007 /* CPU (unsigned)v dead */

#define CPU_POST_DEAD		0x0009 /* CPU (unsigned)v dead, cpu_hotplug

					* lock is dropped */

#define CPU_BROKEN		0x000C /* CPU (unsigned)v did not die properly,

					* perhaps due to preemption. */

#define CPU_TASKS_FROZEN	0x0010



#define CPU_ONLINE_FROZEN	(CPU_ONLINE | CPU_TASKS_FROZEN)

#define CPU_UP_PREPARE_FROZEN	(CPU_UP_PREPARE | CPU_TASKS_FROZEN)

#define CPU_UP_CANCELED_FROZEN  (CPU_UP_CANCELED | CPU_TASKS_FROZEN)

#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)

#define CPU_DOWN_FAILED_FROZEN  (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)

#define CPU_DEAD_FROZEN		(CPU_DEAD | CPU_TASKS_FROZEN)
 
#define cpuhp_setup_state_nocalls(a, b, c, d)	(0)

tools/testing/radix-tree/linux/notifier.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _NOTIFIER_H

#define _NOTIFIER_H



struct notifier_block;



#define NOTIFY_OK              0x0001          /* Suits me */



#endif