diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /include/linux/linkage.h | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'include/linux/linkage.h')
| -rw-r--r-- | include/linux/linkage.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index c2619da50..aaf6edf02 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -1,6 +1,8 @@ #ifndef _LINUX_LINKAGE_H #define _LINUX_LINKAGE_H +#include <linux/config.h> + #ifdef __cplusplus #define CPP_ASMLINKAGE extern "C" #else @@ -35,13 +37,13 @@ #define __ALIGN .balign 4 #define __ALIGN_STR ".balign 4" #else -#if !defined(__i486__) && !defined(__i586__) -#define __ALIGN .align 4,0x90 -#define __ALIGN_STR ".align 4,0x90" -#else /* __i486__/__i586__ */ +#if defined(__i386__) && defined(CONFIG_X86_ALIGNMENT_16) #define __ALIGN .align 16,0x90 #define __ALIGN_STR ".align 16,0x90" -#endif /* __i486__/__i586__ */ +#else +#define __ALIGN .align 4,0x90 +#define __ALIGN_STR ".align 4,0x90" +#endif #endif /* __sh__ */ #endif /* __mc68000__ */ #endif /* __arm__ */ |