Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-31
+7
-1
drivers/block/zram/zram_drv.c
+7
-1
drivers/block/zram/zram_drv.c
···
1413
1413
return ret ? ret : count;
1414
1414
}
1415
1415
1416
+
/*
1417
+
* NOTE: hot_add attribute is not the usual read-only sysfs attribute. In a
1418
+
* sense that reading from this file does alter the state of your system -- it
1419
+
* creates a new un-initialized zram device and returns back this device's
1420
+
* device_id (or an error code if it fails to create a new device).
1421
+
*/
1416
1422
static struct class_attribute zram_control_class_attrs[] = {
1417
-
__ATTR_RO(hot_add),
1423
+
__ATTR(hot_add, 0400, hot_add_show, NULL),
1418
1424
__ATTR_WO(hot_remove),
1419
1425
__ATTR_NULL,
1420
1426
};
+1
kernel/kcov.c
+1
kernel/kcov.c
-1
lib/radix-tree.c
-1
lib/radix-tree.c
+1
-21
tools/testing/radix-tree/linux/cpu.h
+1
-21
tools/testing/radix-tree/linux/cpu.h
···
1
-
2
-
#define hotcpu_notifier(a, b)
3
-
4
-
#define CPU_ONLINE 0x0002 /* CPU (unsigned)v is up */
5
-
#define CPU_UP_PREPARE 0x0003 /* CPU (unsigned)v coming up */
6
-
#define CPU_UP_CANCELED 0x0004 /* CPU (unsigned)v NOT coming up */
7
-
#define CPU_DOWN_PREPARE 0x0005 /* CPU (unsigned)v going down */
8
-
#define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */
9
-
#define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */
10
-
#define CPU_POST_DEAD 0x0009 /* CPU (unsigned)v dead, cpu_hotplug
11
-
* lock is dropped */
12
-
#define CPU_BROKEN 0x000C /* CPU (unsigned)v did not die properly,
13
-
* perhaps due to preemption. */
14
-
#define CPU_TASKS_FROZEN 0x0010
15
-
16
-
#define CPU_ONLINE_FROZEN (CPU_ONLINE | CPU_TASKS_FROZEN)
17
-
#define CPU_UP_PREPARE_FROZEN (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
18
-
#define CPU_UP_CANCELED_FROZEN (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
19
-
#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
20
-
#define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
21
-
#define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN)
1
+
#define cpuhp_setup_state_nocalls(a, b, c, d) (0)