mmotm 2010-06-11-16-40 uploaded
in [Kernel]
|
Prev: DMAENGINE: ste_dma40: allocate LCLA dynamically
Next: [PATCH 2/2 v2] gpio: msm7200a: Add irq support to msm-gpiolib.
From: Andrew Morton on 11 Jun 2010 23:00 On Sat, 12 Jun 2010 10:43:31 +0800 Dave Young <hidave.darkstar(a)gmail.com> wrote: > On Sat, Jun 12, 2010 at 7:40 AM, <akpm(a)linux-foundation.org> wrote: > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to > > > > __ http://userweb.kernel.org/~akpm/mmotm/ > > > > and will soon be available at > > > > __ git://zen-kernel.org/kernel/mmotm.git > > > > Hi, andrew > > building failed with: > AS arch/x86/kernel/entry_32.o > /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h: Assembler messages: > /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29: Error: > no such instruction: `static inline void > olpc_ofw_detect_range(void){}' > make[2]: *** [arch/x86/kernel/entry_32.o] Error 1 > make[1]: *** [arch/x86/kernel] Error 2 > make: *** [arch/x86] Error 2 > > Attached a patch to fix it (I have not appropriate email client now, > sorry for the inconvenience ) Thanks. We can simplify things a bit I think... #ifndef _ASM_X86_OLPC_OFW_H #define _ASM_X86_OLPC_OFW_H /* hardcode addresses to make life easier dealing w/ VMALLOC_END and others */ #define OLPC_OFW_START 0xff800000UL #define OLPC_OFW_SIZE (PGDIR_SIZE) #define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE) #ifndef __ASSEMBLER__ #ifdef CONFIG_OLPC_OPENFIRMWARE /* address of OFW callback interface; will be NULL if OFW isn't found */ extern int (*olpc_ofw_cif)(int *); /* page dir entry containing OFW's current memory */ extern pgdval_t olpc_ofw_pgd; /* run an OFW command by calling into the firmware */ extern int olpc_ofw(const char *name, int nr_args, int nr_res, ...); /* determine/ensure OFW lives in the proper place in (virtual) memory */ void olpc_ofw_detect_range(void); #else /* CONFIG_OLPC_OPENFIRMWARE */ static inline void olpc_ofw_detect_range(void) { } #endif /* CONFIG_OLPC_OPENFIRMWARE */ #endif /* __ASSEMBLER__ */ #endif --- a/arch/x86/include/asm/olpc_ofw.h~x86-olpc-add-support-for-calling-into-openfirmware-fix-fix +++ a/arch/x86/include/asm/olpc_ofw.h @@ -6,10 +6,10 @@ #define OLPC_OFW_SIZE (PGDIR_SIZE) #define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE) -#ifdef CONFIG_OLPC_OPENFIRMWARE - #ifndef __ASSEMBLER__ +#ifdef CONFIG_OLPC_OPENFIRMWARE + /* address of OFW callback interface; will be NULL if OFW isn't found */ extern int (*olpc_ofw_cif)(int *); @@ -22,14 +22,12 @@ extern int olpc_ofw(const char *name, in /* determine/ensure OFW lives in the proper place in (virtual) memory */ void olpc_ofw_detect_range(void); -#endif - -#else +#else /* CONFIG_OLPC_OPENFIRMWARE */ -#ifndef __ASSEMBLER__ static inline void olpc_ofw_detect_range(void) { } -#endif -#endif +#endif /* CONFIG_OLPC_OPENFIRMWARE */ + +#endif /* __ASSEMBLER__ */ #endif _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Andres Salomon on 12 Jun 2010 02:10 On Fri, 11 Jun 2010 19:54:21 -0700 Andrew Morton <akpm(a)linux-foundation.org> wrote: > On Sat, 12 Jun 2010 10:43:31 +0800 Dave Young > <hidave.darkstar(a)gmail.com> wrote: > > > On Sat, Jun 12, 2010 at 7:40 AM, <akpm(a)linux-foundation.org> wrote: > > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded > > > to > > > > > > __ http://userweb.kernel.org/~akpm/mmotm/ > > > > > > and will soon be available at > > > > > > __ git://zen-kernel.org/kernel/mmotm.git > > > > > > > Hi, andrew > > > > building failed with: > > AS arch/x86/kernel/entry_32.o > > /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h: > > Assembler > > messages: /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29: > > Error: no such instruction: `static inline void > > olpc_ofw_detect_range(void){}' make[2]: *** > > [arch/x86/kernel/entry_32.o] Error 1 make[1]: *** [arch/x86/kernel] > > Error 2 make: *** [arch/x86] Error 2 > > > > Attached a patch to fix it (I have not appropriate email client now, > > sorry for the inconvenience ) > > Thanks. > > We can simplify things a bit I think... > > #ifndef _ASM_X86_OLPC_OFW_H > #define _ASM_X86_OLPC_OFW_H > > /* hardcode addresses to make life easier dealing w/ VMALLOC_END and > others */ #define OLPC_OFW_START 0xff800000UL > #define OLPC_OFW_SIZE (PGDIR_SIZE) > #define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE) > > #ifndef __ASSEMBLER__ > > #ifdef CONFIG_OLPC_OPENFIRMWARE > > /* address of OFW callback interface; will be NULL if OFW isn't found > */ extern int (*olpc_ofw_cif)(int *); > > /* page dir entry containing OFW's current memory */ > extern pgdval_t olpc_ofw_pgd; > > /* run an OFW command by calling into the firmware */ > extern int olpc_ofw(const char *name, int nr_args, int nr_res, ...); > > /* determine/ensure OFW lives in the proper place in (virtual) memory > */ void olpc_ofw_detect_range(void); > > #else /* CONFIG_OLPC_OPENFIRMWARE */ > > static inline void olpc_ofw_detect_range(void) { } > > #endif /* CONFIG_OLPC_OPENFIRMWARE */ > > #endif /* __ASSEMBLER__ */ > > #endif > Thanks, I've changed it to something similar in my git tree. It'll be in the next patch (once I've addressed hpa's concerns). -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 12 Jun 2010 11:40 Hi Andrew, On Fri, 11 Jun 2010 16:40:13 -0700 akpm(a)linux-foundation.org wrote: > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to > > http://userweb.kernel.org/~akpm/mmotm/ > > and will soon be available at > > git://zen-kernel.org/kernel/mmotm.git The version in this git tree stops just before patch scsi-remove-private-bit-macros.patch. I suspect that is because "git am" doe not like that patch (it has "a/./drivers..." as the file names). There are a few later patches that "git am" also does not like - because either they have no commit message, no From: line, or do not apply without some fuzz. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Andrew Morton on 12 Jun 2010 13:20 On Sun, 13 Jun 2010 01:37:18 +1000 Stephen Rothwell <sfr(a)canb.auug.org.au> wrote: > Hi Andrew, > > On Fri, 11 Jun 2010 16:40:13 -0700 akpm(a)linux-foundation.org wrote: > > > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to > > > > http://userweb.kernel.org/~akpm/mmotm/ > > > > and will soon be available at > > > > git://zen-kernel.org/kernel/mmotm.git > > The version in this git tree stops just before patch > scsi-remove-private-bit-macros.patch. I suspect that is because "git am" > doe not like that patch (it has "a/./drivers..." as the file names). git bug. I fixed the patch. > There are a few later patches that "git am" also does not like - because > either they have no commit message That should be OK - we often have unchangelogged patches. Real simple ones. >, no From: line, Well. What From: line do I put on origin.patch and linux-next.patch?? I fixed the others. > or do not apply > without some fuzz. That's a bit silly. Oh well, I can try to remember to rediff everything before uploading. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 12 Jun 2010 23:40
Hi Andrew, On Sat, 12 Jun 2010 10:10:14 -0700 Andrew Morton <akpm(a)linux-foundation.org> wrote: > > On Sun, 13 Jun 2010 01:37:18 +1000 Stephen Rothwell <sfr(a)canb.auug.org.au> wrote: > > > On Fri, 11 Jun 2010 16:40:13 -0700 akpm(a)linux-foundation.org wrote: > > > > > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to > > > > > > http://userweb.kernel.org/~akpm/mmotm/ > > > > > > and will soon be available at > > > > > > git://zen-kernel.org/kernel/mmotm.git > > > > The version in this git tree stops just before patch > > scsi-remove-private-bit-macros.patch. I suspect that is because "git am" > > doe not like that patch (it has "a/./drivers..." as the file names). > > git bug. I fixed the patch. Yeah, these comments were more reflections on the "import to git" procedures than on the patches themselves. > >, no From: line, > > Well. What From: line do I put on origin.patch and linux-next.patch?? They were not the problem (for me at least). > I fixed the others. Thanks. > > or do not apply > > without some fuzz. > > That's a bit silly. Oh well, I can try to remember to rediff > everything before uploading. Not really necessary, git am is a but anal in that regard (for good reason usually). -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |