Sounds good. Therefore, the patch becomes: diff --git a/arch/m68k/include/asm/ide.h b/arch/m68k/include/asm/ide.h index 3958726..80e3e87 100644 --- a/arch/m68k/include/asm/ide.h +++ b/arch/m68k/include/asm/ide.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-m68k/ide.h + * arch/m68k/include/ide.h * * Copyright (C) 1994-1996 Linus Torvalds & authors */ @@ -34,6 +34,8 @@ #include <asm/io.h> #include <asm/irq.h> +#ifdef CONFIG_MMU + /* * Get rid of defs from io.h - ide has its private and conflicting versions * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we @@ -53,5 +55,14 @@ #define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) #define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) +#else + +#define __ide_mm_insw(port, addr, n) io_insw((unsigned int)port, addr, n) +#define __ide_mm_insl(port, addr, n) io_insl((unsigned int)port, addr, n) +#define __ide_mm_outsw(port, addr, n) io_outsw((unsigned int)port, addr, n) +#define __ide_mm_outsl(port, addr, n) io_outsl((unsigned int)port, addr, n) + +#endif /* CONFIG_MMU */ + #endif /* __KERNEL__ */ #endif /* _M68K_IDE_H */
-----Original Message----- From: uclinux-dev-boun...@uclinux.org [mailto:uclinux-dev-boun...@uclinux.org] On Behalf Of Greg Ungerer Sent: Sunday, June 06, 2010 9:43 PM To: uClinux development list Subject: Re: [uClinux-dev] [PATCH] arch/m68k/ide.h fix for nommu Philippe De Muyter wrote: > On Thu, Jun 03, 2010 at 09:43:33AM -0400, Jate Sujjavanich wrote: >> Here's a resubmission. >> ---------------------------- >> The arch/m68k/include/asm/ide.h produces errors when the IDE driver is >> compiled for my 523x uClinux system under kernel. The header makes some >> redefines of operators not defined in the arch/m68k/include/asm/io_no.h >> header. There are no separate mmio and iospace defines. >> >> This solution follows the convention used for other mmu/nommu headers in the >> m68k arch. > > This is not really a convention. It is a temporary situation resulting > from the merge of arch/m68k/include and arch/m68knommu/include. > > So please do not gratuitly create new unneeded files. One ide.h is enough. I totally agree with Philippe on this one. I have worked hard to reduce the _mm/_no separation :-) One well placed "#ifdef CONFIG_MMU" is the best solution. (Note the use of CONFIG_MMU for non-exported headers.) Regards Greg >> Signed-off-by: Jate Sujjavanich <jsujjavan...@syntech-fuelmaster.com> >> >> >> diff --git a/arch/m68k/include/asm/ide.h b/arch/m68k/include/asm/ide.h >> index 3958726..ed40426 100644 >> --- a/arch/m68k/include/asm/ide.h >> +++ b/arch/m68k/include/asm/ide.h > > [...] > >> +#ifdef __uClinux__ >> +#include "ide_no.h" >> +#else >> +#include "ide_mm.h" >> +#endif >> diff --git a/arch/m68k/include/asm/ide_mm.h b/arch/m68k/include/asm/ide_mm.h >> new file mode 100644 >> index 0000000..11c2ee6 >> --- /dev/null >> +++ b/arch/m68k/include/asm/ide_mm.h > > [...] > >> diff --git a/arch/m68k/include/asm/ide_no.h b/arch/m68k/include/asm/ide_no.h >> new file mode 100644 >> index 0000000..d32919c >> --- /dev/null >> +++ b/arch/m68k/include/asm/ide_no.h > -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: g...@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com _______________________________________________ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev ************************************************************************************ This footnote confirms that this email message has been scanned by PineApp Mail-SeCure for the presence of malicious code, vandals & computer viruses. ************************************************************************************ _______________________________________________ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
