On 11/13/2013 07:21 PM, Hans-Christian Egtvedt wrote: > Around Tue 12 Nov 2013 16:38:47 +0800 or thereabout, Chen Gang wrote: >> For all uapi headers, need use "_UAPI" prefix for its guard macro >> (which will be stripped by "scripts/headers_installer.sh"). >> >> Also remove redundant files (bitsperlong.h, errno.h, fcntl.h, ioctl.h, >> ioctls.h, ipcbuf.h, kvm_para.h, mman.h, poll.h, resource.h, siginfo.h, >> statfs.h, and unistd.h) which are already in Kbuild. >> >> Also be sure that all "#endif" only have one empty line above, and each >> file has guard macro. > > Thank you for fixing and cleaning, but this current patch does not build after > applying. The deleted files needs to be added in Kbuild to pick the generic > header files instead. >
Oh, it is my fault, thanks. :-) > Something ala > diff --git a/arch/avr32/include/uapi/asm/Kbuild > b/arch/avr32/include/uapi/asm/Kbuild > index 3b85ead..08d8a3d 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -2,35 +2,35 @@ > include include/uapi/asm-generic/Kbuild.asm > > header-y += auxvec.h > -header-y += bitsperlong.h > header-y += byteorder.h > header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > header-y += msgbuf.h > header-y += param.h > -header-y += poll.h > header-y += posix_types.h > header-y += ptrace.h > -header-y += resource.h > header-y += sembuf.h > header-y += setup.h > header-y += shmbuf.h > header-y += sigcontext.h > -header-y += siginfo.h > header-y += signal.h > header-y += socket.h > header-y += sockios.h > header-y += stat.h > -header-y += statfs.h > header-y += swab.h > header-y += termbits.h > header-y += termios.h > header-y += types.h > header-y += unistd.h > +generic-y += bitsperlong.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += kvm_para.h > +generic-y += mman.h > generic-y += param.h > +generic-y += poll.h > +generic-y += resource.h > +generic-y += siginfo.h > +generic-y += statfs.h > And I should check my original another architectures' 'same' patches for 'header-y' and 'generic-y'. > I can amend this change, and add the patch to my for-linus branch. > >> Signed-off-by: Chen Gang <gang.c...@asianux.com> > > Signed-off-by: Hans-Christian Egtvedt <egtv...@samfundet.no> > Thank you very much. > > <snipp diff> > Thanks. -- Chen Gang -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
