Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0de19a45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
  sh: export empty_zero_page
  sh: arch/sh/kernel/traps_32.c needs asm/fpu.h
  sh: fix compressed kernel build
  sh64: add missing #include <asm/fpu.h>'s
parents abe2f414 fd785d6b

arch/sh/boot/compressed/head_32.S

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


.text



#include <linux/linkage.h>

#include <asm/page.h>



	.global	startup

arch/sh/boot/compressed/head_64.S

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * Modification for compressed loader:

 *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)

 */

#include <linux/linkage.h>

#include <asm/cache.h>

#include <asm/cpu/mmu_context.h>

#include <asm/cpu/registers.h>

arch/sh/kernel/process_64.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/mmu_context.h>

#include <asm/fpu.h>



struct task_struct *last_task_used_math = NULL;

arch/sh/kernel/ptrace_64.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/system.h>

#include <asm/processor.h>

#include <asm/mmu_context.h>

#include <asm/fpu.h>



/* This mask defines the bits of the SR which the user is not allowed to

   change, which are everything except S, Q, M, PR, SZ, FR. */

arch/sh/kernel/sh_ksyms_32.c

+1 −0
Original line number Diff line number Diff line
@@ -149,3 +149,4 @@ EXPORT_SYMBOL(clear_page); 
EXPORT_SYMBOL(copy_page);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(_ebss);

EXPORT_SYMBOL(empty_zero_page);