From e72c5f86cc731fbd00f6ea6f7ceb4941ff10a276 Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Jun 27 2014 15:21:37 +0000
Subject: Add two small patches for kernel debranding.

Addresses arch/x86/kernel/setup.c and kernel/rh_taint.c
Modified spec to apply patches.

---

diff --git a/SOURCES/debrand-rh_taint.patch b/SOURCES/debrand-rh_taint.patch
new file mode 100644
index 0000000..8ef4557
--- /dev/null
+++ b/SOURCES/debrand-rh_taint.patch
@@ -0,0 +1,25 @@
+From 69c0d42cfa26515196896dea086857c2caccb6eb Mon Sep 17 00:00:00 2001
+From: Jim Perrin <jperrin@centos.org>
+Date: Thu, 19 Jun 2014 10:05:12 -0500
+Subject: [PATCH] branding patch for rh_taint
+
+---
+ kernel/rh_taint.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c
+index 59a74b0..0708e15 100644
+--- a/kernel/rh_taint.c
++++ b/kernel/rh_taint.c
+@@ -8,7 +8,7 @@
+ void mark_hardware_unsupported(const char *msg)
+ {
+ 	/* Print one single message */
+-	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg);
++	pr_crit("Warning: %s - this hardware has not undergone upstream testing. Please consult http://wiki.centos.org/FAQ for more information\n", msg);
+ }
+ EXPORT_SYMBOL(mark_hardware_unsupported);
+ 
+-- 
+1.8.3.1
+
diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch
new file mode 100644
index 0000000..9d2e08b
--- /dev/null
+++ b/SOURCES/debrand-single-cpu.patch
@@ -0,0 +1,25 @@
+From 66185f5c6f881847776702e3a7956c504400f4f2 Mon Sep 17 00:00:00 2001
+From: Jim Perrin <jperrin@centos.org>
+Date: Thu, 19 Jun 2014 09:53:13 -0500
+Subject: [PATCH] branding patch for single-cpu systems
+
+---
+ arch/x86/kernel/setup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index b289118..9d25982 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -846,7 +846,7 @@ static void rh_check_supported(void)
+ 	if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
+ 	    !x86_hyper && !cpu_has_hypervisor && !is_kdump_kernel()) {
+ 		pr_crit("Detected single cpu native boot.\n");
+-		pr_crit("Important:  In Red Hat Enterprise Linux 7, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems.");
++		pr_crit("Important:  In CentOS 7, single threaded, single CPU 64-bit physical systems are unsupported. Please see http://wiki.centos.org/FAQ for more information");
+ 	}
+ 
+ 	/* The RHEL7 kernel does not support this hardware.  The kernel will
+-- 
+1.8.3.1
+
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 24280b8..db9a0a2 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -366,6 +366,10 @@ Source72: kernel-%{version}-s390x-kdump.config
 Source2000: cpupower.service
 Source2001: cpupower.config
 
+# branding patches
+Patch1001: debrand-single-cpu.patch
+Patch1002: debrand-rh_taint.patch
+
 # empty final patch to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
 
@@ -667,6 +671,11 @@ cd linux-%{KVRA}
 # Drop some necessary files from the source dir into the buildroot
 cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
 
+# CentOS Branding Modification
+ApplyOptionalPatch debrand-rh_taint.patch
+ApplyOptionalPatch debrand-single-cpu.patch
+# End of CentOS Modification
+
 ApplyOptionalPatch linux-kernel-test.patch
 
 # Any further pre-build tree manipulations happen here.