squash errant removal into original patch

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 5 insertions, 38 deletions

diff --git a/series b/series
index d981e93..d0e9b97 100644
--- a/series
+++ b/series
@@ -285,7 +285,6 @@ net-Fix-netfilter-percpu-assumptions-for-real.patch
 x86-highmem-Remove-leftover-function-prototypes.patch
 softirq-Name-hrtimer-softirq-also-when-CONFIG_HIGH_R.patch
 slab-Cover-the-numa-aliens-with-the-per-cpu-locked-c.patch
-x86-highmem-Restore-the-not-so-leftover-function-pro.patch
 ipc-fix-rt-non_rt-imbalance.patch
 hwlat-Fix-Kconfig-and-check-kthread_stop-result.patch
 ftrace-Consider-shared-max-priority-in-latency-histo.patch
diff --git a/x86-highmem-Remove-leftover-function-prototypes.patch b/x86-highmem-Remove-leftover-function-prototypes.patch
index 963a74d..2b20980 100644
--- a/x86-highmem-Remove-leftover-function-prototypes.patch
+++ b/x86-highmem-Remove-leftover-function-prototypes.patch
@@ -1,4 +1,4 @@
-From 5e2c2721a4cbcfd4f0dded4300394f3e4c27eee4 Mon Sep 17 00:00:00 2001
+From 1c3b7368a95cfa00961205df2dce6ce1bedc9455 Mon Sep 17 00:00:00 2001
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Fri, 9 Oct 2009 20:51:54 +0200
 Subject: [PATCH] x86: highmem: Remove leftover function prototypes
@@ -11,10 +11,10 @@ commit e31b7991974d68e89a84d7e7bed5af5a0a7c91be in tip.
 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 
 diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h
-index 8391a46..21b3017 100644
+index 8391a46..0fe5963 100644
 --- a/arch/x86/include/asm/highmem.h
 +++ b/arch/x86/include/asm/highmem.h
-@@ -68,14 +68,6 @@ void __kunmap_atomic(void *kvaddr, enum km_type type);
+@@ -68,13 +68,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type);
  void *__kmap_atomic_pfn(unsigned long pfn, enum km_type type);
  struct page *__kmap_atomic_to_page(void *ptr);
  
@@ -23,12 +23,11 @@ index 8391a46..21b3017 100644
 -void *kmap_atomic(struct page *page, enum km_type type);
 -void kunmap_atomic(void *kvaddr, enum km_type type);
 -void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
--void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
+ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
 -struct page *kmap_atomic_to_page(void *ptr);
--
+ 
  #define flush_cache_kmaps()	do { } while (0)
  
- extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
 -- 
 1.7.1.1
 
diff --git a/x86-highmem-Restore-the-not-so-leftover-function-pro.patch b/x86-highmem-Restore-the-not-so-leftover-function-pro.patch
deleted file mode 100644
index b39fcc6..0000000
--- a/x86-highmem-Restore-the-not-so-leftover-function-pro.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 41767b6a33976349359e78d34c5d70ec71c99a5d Mon Sep 17 00:00:00 2001
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Tue, 13 Oct 2009 22:23:40 +0200
-Subject: [PATCH] x86: highmem: Restore the not so leftover function prototype
-
-commit bfb35e3c6436ac06659029ca67a5940ca08efa20 in tip.
-
-commit e31b799 (x86: highmem: Remove leftover function prototypes)
-removed kmap_atomic_prot_pfn() which is not a leftover, but should
-have been left where it was.
-
-Restore it.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-
-diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h
-index 21b3017..0fe5963 100644
---- a/arch/x86/include/asm/highmem.h
-+++ b/arch/x86/include/asm/highmem.h
-@@ -68,6 +68,8 @@ void __kunmap_atomic(void *kvaddr, enum km_type type);
- void *__kmap_atomic_pfn(unsigned long pfn, enum km_type type);
- struct page *__kmap_atomic_to_page(void *ptr);
- 
-+void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
-+
- #define flush_cache_kmaps()	do { } while (0)
- 
- extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
--- 
-1.7.1.1
-