Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.de>2010-02-25 20:06:12 +0100
committerJeff Mahoney <jeffm@suse.de>2010-02-25 20:06:12 +0100
commitb7bca5b05016a49d4eea335efa861fb37080d6c8 (patch)
tree6179f5603851a0880df970948809e07ee628adf8
parentab12d21b63a0969173cf4a462a31a9d7e3faf6d6 (diff)
- patches.rpmify/ia64-sn-fix-percpu-warnings: Obsolete.rpm-2.6.33-6rpm-2.6.33-5
-rw-r--r--kernel-source.changes5
-rw-r--r--patches.rpmify/ia64-sn-fix-percpu-warnings37
-rw-r--r--series.conf1
3 files changed, 5 insertions, 38 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 0f915c5b5c..ef72b92ed3 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Feb 25 20:06:05 CET 2010 - jeffm@suse.de
+
+- patches.rpmify/ia64-sn-fix-percpu-warnings: Obsolete.
+
+-------------------------------------------------------------------
Thu Feb 25 16:38:31 CET 2010 - mmarek@suse.cz
- Drop include of generated/autoconf.h in our patches, it's not
diff --git a/patches.rpmify/ia64-sn-fix-percpu-warnings b/patches.rpmify/ia64-sn-fix-percpu-warnings
deleted file mode 100644
index 253f96d2b0..0000000000
--- a/patches.rpmify/ia64-sn-fix-percpu-warnings
+++ /dev/null
@@ -1,37 +0,0 @@
-Subject: [-next] ia64/sn: fix percpu warnings
-Date: Wed, 14 Oct 2009 22:10:03 -0000
-From: Randy Dunlap <randy.dunlap@oracle.com>
-X-Patchwork-Id: 53873
-
-Fix percpu types warning in ia64/sn:
-
-arch/ia64/sn/kernel/setup.c:74: error: conflicting types for '__pcpu_scope___sn_cnodeid_to_nasid'
-arch/ia64/include/asm/sn/arch.h:74: error: previous declaration of '__pcpu_scope___sn_cnodeid_to_nasid' was here
-
-Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
-Cc: Jes Sorensen <jes@sgi.com>
-Acked-by: Tejun Heo <tj@kernel.org>
-Acked-by: Michal Marek <mmarek@suse.cz>
-
----
-arch/ia64/include/asm/sn/arch.h | 2 +-
- arch/ia64/include/asm/sn/arch.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at http://www.tux.org/lkml/
-
---- a/arch/ia64/include/asm/sn/arch.h
-+++ b/arch/ia64/include/asm/sn/arch.h
-@@ -71,7 +71,7 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __
- * Compact node ID to nasid mappings kept in the per-cpu data areas of each
- * cpu.
- */
--DECLARE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
-+DECLARE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);
- #define sn_cnodeid_to_nasid (&__get_cpu_var(__sn_cnodeid_to_nasid[0]))
-
-
diff --git a/series.conf b/series.conf
index 3b844e52ab..cf28725c17 100644
--- a/series.conf
+++ b/series.conf
@@ -34,7 +34,6 @@
# and patched flavors.
########################################################
patches.rpmify/tsi148-dependency
- patches.rpmify/ia64-sn-fix-percpu-warnings
patches.rpmify/rtl8192u-dont-use-mhard-float
patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings
patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning