summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2012-10-17 23:08:20 -0700
committerChris Zankel <chris@zankel.net>2012-10-19 10:24:20 -0700
commit39070cb8a39a84f3379dd8d1dab489e06f3a50a7 (patch)
tree0e79bab84dea6e9bd91d8cedbbe639c8d1c702ed
parent795ca178c4fbb4e5d703df8cdab5c1711ba402b1 (diff)
downloadlinux-3.10-39070cb8a39a84f3379dd8d1dab489e06f3a50a7.tar.gz
linux-3.10-39070cb8a39a84f3379dd8d1dab489e06f3a50a7.tar.bz2
linux-3.10-39070cb8a39a84f3379dd8d1dab489e06f3a50a7.zip
xtensa: minor compiler warning fix
Fix two compiler warnings complaining about truncating a value on a 64-bit host, and about declaring an unused variable that is only used for a specific configuration. Signed-off-by: Chris Zankel <chris@zankel.net>
-rw-r--r--arch/xtensa/kernel/entry.S2
-rw-r--r--arch/xtensa/kernel/process.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 30b5c5f7b7e..18453067c25 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1542,7 +1542,7 @@ ENTRY(fast_second_level_miss)
* pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_DIRECTORY
*/
- movi a1, -PAGE_OFFSET
+ movi a1, (-PAGE_OFFSET) & 0xffffffff
add a0, a0, a1 # pmdval - PAGE_OFFSET
extui a1, a0, 0, PAGE_SHIFT # ... & PAGE_MASK
xor a0, a0, a1
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 7901ee76b9b..1908f6642d3 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -190,10 +190,13 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
struct task_struct * p, struct pt_regs * regs)
{
struct pt_regs *childregs;
- struct thread_info *ti;
unsigned long tos;
int user_mode = user_mode(regs);
+#if (XTENSA_HAVE_COPROCESSORS || XTENSA_HAVE_IO_PORTS)
+ struct thread_info *ti;
+#endif
+
/* Set up new TSS. */
tos = (unsigned long)task_stack_page(p) + THREAD_SIZE;
if (user_mode)