2 .36 patches dropped

diff --git a/queue-2.6.36/oprofile-remove-deprecated-use-of-flush_scheduled_work.patch b/queue-2.6.36/oprofile-remove-deprecated-use-of-flush_scheduled_work.patch
deleted file mode 100644 (file)
index 972532a..0000000
--- a/queue-2.6.36/oprofile-remove-deprecated-use-of-flush_scheduled_work.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 Mon Sep 17 00:00:00 2001
-From: Tejun Heo <tj@kernel.org>
-Date: Fri, 15 Oct 2010 09:51:08 -0400
-Subject: oprofile: Remove deprecated use of flush_scheduled_work()
-
-From: Tejun Heo <tj@kernel.org>
-
-commit 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 upstream.
-
-flush_scheduled_work() is deprecated and scheduled to be removed.
-sync_stop() currently cancels cpu_buffer works inside buffer_mutex and
-flushes the system workqueue outside.  Instead, split end_cpu_work()
-into two parts - stopping further work enqueues and flushing works -
-and do the former inside buffer_mutex and latter outside.
-
-For stable kernels v2.6.35.y and v2.6.36.y.
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Robert Richter <robert.richter@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/oprofile/buffer_sync.c |    2 +-
- drivers/oprofile/cpu_buffer.c  |   10 +++++++---
- drivers/oprofile/cpu_buffer.h  |    1 +
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
---- a/drivers/oprofile/buffer_sync.c
-+++ b/drivers/oprofile/buffer_sync.c
-@@ -190,7 +190,7 @@ void sync_stop(void)
-       profile_event_unregister(PROFILE_TASK_EXIT, &task_exit_nb);
-       task_handoff_unregister(&task_free_nb);
-       mutex_unlock(&buffer_mutex);
--      flush_scheduled_work();
-+      flush_cpu_work();
- 
-       /* make sure we don't leak task structs */
-       process_task_mortuary();
---- a/drivers/oprofile/cpu_buffer.c
-+++ b/drivers/oprofile/cpu_buffer.c
-@@ -111,14 +111,18 @@ void start_cpu_work(void)
- 
- void end_cpu_work(void)
- {
--      int i;
--
-       work_enabled = 0;
-+}
-+
-+void flush_cpu_work(void)
-+{
-+      int i;
- 
-       for_each_online_cpu(i) {
-               struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i);
- 
--              cancel_delayed_work(&b->work);
-+              /* these works are per-cpu, no need for flush_sync */
-+              flush_delayed_work(&b->work);
-       }
- }
- 
---- a/drivers/oprofile/cpu_buffer.h
-+++ b/drivers/oprofile/cpu_buffer.h
-@@ -25,6 +25,7 @@ void free_cpu_buffers(void);
- 
- void start_cpu_work(void);
- void end_cpu_work(void);
-+void flush_cpu_work(void);
- 
- /* CPU buffer is composed of such entries (which are
-  * also used for context switch notes)

diff --git a/queue-2.6.36/series b/queue-2.6.36/series
index 2c9a51483c0b3b571bcd1bdac8e10831ef70c7dc..6c380e33e552ec16409c2e11c0170054dd73dd4d 100644 (file)
--- a/queue-2.6.36/series
+++ b/queue-2.6.36/series
@@ -108,7 +108,6 @@ um-remove-page_size-alignment-in-linker-script-causing-kernel-segfault.patch
 um-fix-global-timer-issue-when-using-config_no_hz.patch
 numa-fix-slab_node-mpol_bind.patch
 hwmon-lm85-fix-adt7468-frequency-table.patch
-oprofile-remove-deprecated-use-of-flush_scheduled_work.patch
 oprofile-fix-the-hang-while-taking-the-cpu-offline.patch
 mm-fix-return-value-of-scan_lru_pages-in-memory-unplug.patch
 mm-page-allocator-do-not-check-the-state-of-a-non-existant-buddy-during-free.patch
@@ -254,4 +253,3 @@ staging-samsung-laptop-fix-up-my-fixup-for-some-sysfs-attribute-permissions.patc
 staging-frontier-fix-up-some-sysfs-attribute-permissions.patch
 staging-rtl8187se-change-panic-to-warn-when-rf-switch-turned-off.patch
 staging-batman-adv-ensure-that-eth_type_trans-gets-linear-memory.patch
-staging-zram-fix-up-some-sysfs-attribute-permissions.patch

diff --git a/queue-2.6.36/staging-zram-fix-up-some-sysfs-attribute-permissions.patch b/queue-2.6.36/staging-zram-fix-up-some-sysfs-attribute-permissions.patch
deleted file mode 100644 (file)
index fa77312..0000000
--- a/queue-2.6.36/staging-zram-fix-up-some-sysfs-attribute-permissions.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0281b490dd7b96990724f4a15842c55657699aed Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@suse.de>
-Date: Tue, 16 Nov 2010 11:22:43 -0800
-Subject: Staging: zram: fix up some sysfs attribute permissions
-
-From: Greg Kroah-Hartman <gregkh@suse.de>
-
-commit 0281b490dd7b96990724f4a15842c55657699aed upstream.
-
-They should not be writable by any user
-
-Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Nitin Gupta <ngupta@vflare.org>
-Cc: Pekka Enberg <penberg@cs.helsinki.fi>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c
-index 6c574a9..c9b52b9 100644
---- a/drivers/staging/zram/zram_sysfs.c
-+++ b/drivers/staging/zram/zram_sysfs.c
-@@ -189,10 +189,10 @@ static ssize_t mem_used_total_show(struct device *dev,
-       return sprintf(buf, "%llu\n", val);
- }
- 
--static DEVICE_ATTR(disksize, S_IRUGO | S_IWUGO,
-+static DEVICE_ATTR(disksize, S_IRUGO | S_IRUSR,
-               disksize_show, disksize_store);
- static DEVICE_ATTR(initstate, S_IRUGO, initstate_show, NULL);
--static DEVICE_ATTR(reset, S_IWUGO, NULL, reset_store);
-+static DEVICE_ATTR(reset, S_IRUSR, NULL, reset_store);
- static DEVICE_ATTR(num_reads, S_IRUGO, num_reads_show, NULL);
- static DEVICE_ATTR(num_writes, S_IRUGO, num_writes_show, NULL);
- static DEVICE_ATTR(invalid_io, S_IRUGO, invalid_io_show, NULL);