diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-12-14 10:11:49 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-12-14 10:11:49 -0800 |
| commit | 6680ebc7a39c4a9661004adb6c8f4abc98fa6322 (patch) | |
| tree | 29fd4895eed432713f7d8c7d55f610fa8cb2e5d9 /c06.patch | |
| parent | 0fbed24161fea03303a09a83f8c3c94f2446980f (diff) | |
| download | patches-6680ebc7a39c4a9661004adb6c8f4abc98fa6322.tar.gz | |
4.10-rc1 early changes
Diffstat (limited to 'c06.patch')
| -rw-r--r-- | c06.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/c06.patch b/c06.patch index a6efc40c0b82ad..ffbb2e2cf61568 100644 --- a/c06.patch +++ b/c06.patch @@ -4,7 +4,7 @@ --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c -@@ -1368,6 +1368,13 @@ static int zram_remove(struct zram *zram +@@ -1369,6 +1369,13 @@ static int zram_remove(struct zram *zram } /* zram-control sysfs attributes */ @@ -18,7 +18,7 @@ static ssize_t hot_add_show(struct class *class, struct class_attribute *attr, char *buf) -@@ -1382,6 +1389,7 @@ static ssize_t hot_add_show(struct class +@@ -1383,6 +1390,7 @@ static ssize_t hot_add_show(struct class return ret; return scnprintf(buf, PAGE_SIZE, "%d\n", ret); } @@ -26,7 +26,7 @@ static ssize_t hot_remove_store(struct class *class, struct class_attribute *attr, -@@ -1412,23 +1420,19 @@ static ssize_t hot_remove_store(struct c +@@ -1413,23 +1421,19 @@ static ssize_t hot_remove_store(struct c mutex_unlock(&zram_index_mutex); return ret ? ret : count; } |