On Tue, Oct 09, 2012 at 10:15:13AM +0100, David Howells wrote: > David Howells (1): > UAPI: (Scripted) Disintegrate arch/arm64/include/asm
It still fails on arm64. The reason is that I had a __SYSCALL_COMPAT guard to provide either the 32-bit syscalls or the 64-bit (generic) ones via asm/unistd.h. With this change: > diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h > index 8f03dee..3d43b19 100644 > --- a/arch/arm64/include/asm/unistd.h > +++ b/arch/arm64/include/asm/unistd.h > @@ -13,13 +13,7 @@ > * You should have received a copy of the GNU General Public License > * along with this program. If not, see <http://www.gnu.org/licenses/>. > */ > - > -#ifndef __SYSCALL_COMPAT > -#include <asm-generic/unistd.h> > -#endif > - > -#ifdef __KERNEL__ > #ifdef CONFIG_COMPAT > #include <asm/unistd32.h> > #endif > -#endif > +#include <uapi/asm/unistd.h> the guard disappears and I get conflicting entries between unistd32.h and unistd.h. The solution is to either keep the __SYSCALL_COMPAT guard in place or rename all the __NR_* macros in unistd32.h to __NR_compat_* and include unistd32.h explicitly where needed (kernel-only header anyway). Since the arm64 kernel would not export 32-bit headers, I would go with the second solution (tried it already). But you need to re-generate the arm64 headers again. BTW, I see the script generated some pretty much empty uapi/asm/unistd.h. Is it possible to using something like Kbuild and just add "generic-y += ..." to just point it to the include/uapi/asm-generic header? -- Catalin -- 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/
