linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] include/asm-generic/io.h: add 'UML' case just like 'no-MMU'
@ 2013-06-26  6:31 Chen Gang
  2013-06-26  6:54 ` Richard Weinberger
  0 siblings, 1 reply; 64+ messages in thread
From: Chen Gang @ 2013-06-26  6:31 UTC (permalink / raw)
  To: Jeff Dike, Richard Weinberger, Arnd Bergmann
  Cc: dhsharp, Mark Brown, sfr@canb.auug.org.au, Steven Rostedt,
	Ingo Molnar, uml-devel, uml-user, linux-kernel@vger.kernel.org,
	Linux-Arch

For "User Mode Linux", it may enable 'MMU', but not need implement
ioremap and iounmap, so "include/asm-generic/io.h" need notice this
case to keep itself 'generic'.

The related error (with allmodconfig, without pcap):

    CC [M]  drivers/ptp/ptp_pch.o
  drivers/ptp/ptp_pch.c: In function ‘pch_remove’:
  drivers/ptp/ptp_pch.c:571:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
  drivers/ptp/ptp_pch.c: In function ‘pch_probe’:
  drivers/ptp/ptp_pch.c:621:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]
  drivers/ptp/ptp_pch.c:621:13: warning: assignment makes pointer from integer without a cast [enabled by default]
  cc1: some warnings being treated as errors


Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
 arch/um/include/asm/Kbuild |    1 +
 include/asm-generic/io.h   |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index b30f34a..a34ea5d 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -3,3 +3,4 @@ generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
 generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
 generic-y += switch_to.h clkdev.h
 generic-y += trace_clock.h
+generic-y += io.h
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index d5afe96..e80331d 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -303,10 +303,10 @@ static inline void *phys_to_virt(unsigned long address)
 /*
  * Change "struct page" to physical address.
  *
- * This implementation is for the no-MMU case only... if you have an MMU
+ * This implementation is for the no-MMU or UML case only... if you have an MMU
  * you'll need to provide your own definitions.
  */
-#ifndef CONFIG_MMU
+#if !CONFIG_MMU || CONFIG_UML
 static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 {
 	return (void __iomem*) (unsigned long)offset;
@@ -325,7 +325,7 @@ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 static inline void iounmap(void __iomem *addr)
 {
 }
-#endif /* CONFIG_MMU */
+#endif /* !CONFIG_MMU || CONFIG_UML */
 
 #ifdef CONFIG_HAS_IOPORT
 #ifndef CONFIG_GENERIC_IOMAP
-- 
1.7.7.6

^ permalink raw reply related	[flat|nested] 64+ messages in thread

end of thread, other threads:[~2013-07-08  2:12 UTC | newest]

Thread overview: 64+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-26  6:31 [PATCH] include/asm-generic/io.h: add 'UML' case just like 'no-MMU' Chen Gang
2013-06-26  6:54 ` Richard Weinberger
2013-06-26  6:54   ` Richard Weinberger
2013-06-26  7:38   ` Geert Uytterhoeven
2013-06-26  7:56     ` Chen Gang
2013-06-26  7:56   ` Chen Gang
2013-06-26  8:05     ` Richard Weinberger
2013-06-26  8:34       ` Chen Gang
2013-06-26  8:34         ` Chen Gang
2013-06-26  8:39         ` Richard Weinberger
2013-06-26  8:58           ` Chen Gang
2013-06-26  9:03             ` Richard Weinberger
2013-06-26  9:33               ` Chen Gang
2013-06-26  9:38                 ` Richard Weinberger
2013-06-26  9:38                   ` Richard Weinberger
2013-06-26  9:48                   ` Geert Uytterhoeven
2013-06-26  9:48                     ` Geert Uytterhoeven
2013-06-26 10:01                     ` Chen Gang
2013-06-26 10:17                       ` Richard Weinberger
2013-06-26 10:22                         ` Chen Gang
2013-06-26 10:22                           ` Chen Gang
2013-07-01  1:40                           ` Chen Gang
2013-07-01  3:43                             ` Chen Gang
2013-07-02  2:13                               ` [PATCH] include/asm-generic/io.h: add dummy fuctions to support 'COMPILE_TEST' in 'asm-generic' Chen Gang
2013-07-02  7:19                                 ` Geert Uytterhoeven
2013-07-02  7:19                                   ` Geert Uytterhoeven
2013-07-02  8:00                                   ` Chen Gang
2013-07-02 10:57                                     ` Geert Uytterhoeven
2013-07-03  0:51                                       ` Chen Gang
2013-07-03  1:26                                         ` Chen Gang
2013-07-03  8:14                                         ` Arnd Bergmann
2013-07-03  8:14                                           ` Arnd Bergmann
2013-07-03  8:43                                           ` Chen Gang
2013-07-04  0:57                                             ` Chen Gang
2013-07-04  1:12                                               ` Greg KH
2013-07-04  1:23                                                 ` Steven Rostedt
2013-07-04  1:23                                                   ` Steven Rostedt
2013-07-04  2:19                                                   ` Chen Gang F T
2013-07-04  1:49                                                 ` Chen Gang
2013-07-04  2:03                                                   ` Steven Rostedt
2013-07-04  2:10                                                     ` Chen Gang F T
2013-07-04  2:29                                                       ` Steven Rostedt
2013-07-04  2:42                                                         ` Chen Gang F T
2013-07-04  3:06                                                           ` Steven Rostedt
2013-07-04  3:26                                                             ` Chen Gang F T
2013-07-04  4:08                                                               ` Greg KH
2013-07-04  4:50                                                                 ` Chen Gang
2013-07-04  6:12                                                                   ` Greg KH
2013-07-04  6:35                                                                     ` Chen Gang
2013-07-04  9:25                                                                       ` Arnd Bergmann
2013-07-04  9:25                                                                         ` Arnd Bergmann
2013-07-05  0:03                                                                         ` Chen Gang F T
2013-07-05  0:12                                                                           ` Greg KH
2013-07-05  0:35                                                                             ` Chen Gang
2013-07-05  0:52                                                                             ` Chen Gang F T
2013-07-05  0:14                                                                           ` Stephen Rothwell
2013-07-05  0:48                                                                             ` Chen Gang F T
2013-07-05  8:01                                                                               ` Chen Gang F T
2013-07-05 11:13                                                                                 ` Arnd Bergmann
2013-07-05 11:13                                                                                   ` Arnd Bergmann
2013-07-08  2:10                                                                                   ` Chen Gang F T
2013-07-04  8:09                                                                     ` Geert Uytterhoeven
2013-07-05  0:10                                                                       ` Chen Gang
2013-06-26  9:54                   ` [PATCH] include/asm-generic/io.h: add 'UML' case just like 'no-MMU' Chen Gang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).