Messages in this thread Patch in this message | | | Subject | [PATCH] Fix Alpha cond_syscall | From | Marc Zyngier <> | Date | 25 Mar 2003 15:05:46 +0100 |
| |
Richard,
The recent changes in CONFIG_NET=n handling have broken cond_syscall implementation on Alpha, since some functions prototypes are visible in kernel/sys.c, while cond_syscall defines them as x(void).
I used the same method as the other platforms to get rid of the problem, and added a comment found in asm-v850/unistd.h explaining the problem.
I'm currently running 2.5.66 with this patch on the Jensen without problems.
Thanks,
M.
# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1017 -> 1.1018 # include/asm-alpha/unistd.h 1.17 -> 1.18 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/03/25 maz@hina.wild-wind.fr.eu.org 1.1018 # Fix alpha cond_syscall to be immune to type-checking. # -------------------------------------------- # diff -Nru a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h --- a/include/asm-alpha/unistd.h Tue Mar 25 14:56:07 2003 +++ b/include/asm-alpha/unistd.h Tue Mar 25 14:56:07 2003 @@ -612,6 +612,12 @@ * What we want is __attribute__((weak,alias("sys_ni_syscall"))), * but it doesn't work on all toolchains, so we just do it by hand */ +#if 0 +/* This doesn't work if there's a function prototype for NAME visible, + because the argument types probably won't match. */ #define cond_syscall(x) asmlinkage long x(void) __attribute__((weak,alias("sys_ni_syscall"))); +#else +#define cond_syscall(x) asm (".weak\t" #x ";\n\t" #x "=sys_ni_syscall"); +#endif #endif /* _ALPHA_UNISTD_H */ -- Places change, faces change. Life is so very strange. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |