git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa
[sfrench/cifs-2.6.git]
/
arch
/
xtensa
/
include
/
asm
/
processor.h
diff --git
a/arch/xtensa/include/asm/processor.h
b/arch/xtensa/include/asm/processor.h
index be9bfd9aa865beb554b2b6e7ce92010cf276b927..34a23016dd1442f5c95d445f13276d97c772072d 100644
(file)
--- a/
arch/xtensa/include/asm/processor.h
+++ b/
arch/xtensa/include/asm/processor.h
@@
-23,7
+23,11
@@
# error Linux requires the Xtensa Windowed Registers Option.
#endif
# error Linux requires the Xtensa Windowed Registers Option.
#endif
-#define ARCH_SLAB_MINALIGN XCHAL_DATA_WIDTH
+/* Xtensa ABI requires stack alignment to be at least 16 */
+
+#define STACK_ALIGN (XCHAL_DATA_WIDTH > 16 ? XCHAL_DATA_WIDTH : 16)
+
+#define ARCH_SLAB_MINALIGN STACK_ALIGN
/*
* User space process size: 1 GB.
/*
* User space process size: 1 GB.