arch-kunmap-remove-duplicate-kunmap-implementations-fix

akpm00 · sfrothwell · commit 56e635a64c2c · 2020-05-15T07:52:15.000+10:00
fix CONFIG_HIGHMEM=n build on various architectures

Reported-by: Stephen Rothwell &lt;sfr@canb.auug.org.au&gt;
Cc: Ira Weiny &lt;ira.weiny@intel.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Stephen Rothwell &lt;sfr@canb.auug.org.au&gt;
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
@@ -53,6 +53,7 @@ static inline void *kmap(struct page *page)
 }
 
 void kunmap_high(struct page *page);
+
 static inline void kunmap(struct page *page)
 {
 	might_sleep();
@@ -111,6 +112,10 @@ static inline void *kmap(struct page *page)
 	return page_address(page);
 }
 
+static inline void kunmap_high(struct page *page)
+{
+}
+
 static inline void kunmap(struct page *page)
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ static inline void kmap(struct page page)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`void kunmap_high(struct page *page);`
	`56`	`+`
`56`	`57`	`static inline void kunmap(struct page *page)`
`57`	`58`	`{`
`58`	`59`	`might_sleep();`
`@@ -111,6 +112,10 @@ static inline void kmap(struct page page)`
`111`	`112`	`return page_address(page);`
`112`	`113`	`}`
`113`	`114`
	`115`	`+static inline void kunmap_high(struct page *page)`
	`116`	`+{`
	`117`	`+}`
	`118`	`+`
`114`	`119`	`static inline void kunmap(struct page *page)`
`115`	`120`	`{`
`116`	`121`	`}`