git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-xtensa
/
coprocessor.h
diff --git
a/include/asm-xtensa/coprocessor.h
b/include/asm-xtensa/coprocessor.h
index
a91b96d
..
bd09ec0
100644
(file)
--- a/
include/asm-xtensa/coprocessor.h
+++ b/
include/asm-xtensa/coprocessor.h
@@
-1,5
+1,5
@@
/*
/*
- * include/asm-xtensa/c
pextra
.h
+ * include/asm-xtensa/c
oprocessor
.h
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
@@
-11,7
+11,16
@@
#ifndef _XTENSA_COPROCESSOR_H
#define _XTENSA_COPROCESSOR_H
#ifndef _XTENSA_COPROCESSOR_H
#define _XTENSA_COPROCESSOR_H
-#include <xtensa/config/core.h>
+#include <asm/variant/core.h>
+#include <asm/variant/tie.h>
+
+#if !XCHAL_HAVE_CP
+
+#define XTENSA_CP_EXTRA_OFFSET 0
+#define XTENSA_CP_EXTRA_ALIGN 1 /* must be a power of 2 */
+#define XTENSA_CP_EXTRA_SIZE 0
+
+#else
#define XTOFS(last_start,last_size,align) \
((last_start+last_size+align-1) & -align)
#define XTOFS(last_start,last_size,align) \
((last_start+last_size+align-1) & -align)
@@
-67,4
+76,6
@@
extern void save_coprocessor_registers(void*, int);
# endif
#endif
# endif
#endif
+#endif
+
#endif /* _XTENSA_COPROCESSOR_H */
#endif /* _XTENSA_COPROCESSOR_H */