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

Commit 10027471 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: Fix up uImage compression type
  remove include/asm-sh/floppy.h
  sh: Fix TIF_USEDFPU clearing under FPU emulation.
  sh: Fix occasional FPU register corruption under preempt.
parents 61434392 26b63e99

arch/sh/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ config SYS_SUPPORTS_NUMA 
config SYS_SUPPORTS_PCI

	bool



config ARCH_MAY_HAVE_PC_FDC

	bool



config STACKTRACE_SUPPORT

	def_bool y

arch/sh/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \ 


quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \

		   -C none -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \

		   -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \

		   -n 'Linux-$(KERNELRELEASE)' -d $< $@



$(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE

arch/sh/kernel/cpu/sh2a/fpu.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/signal.h>

#include <asm/processor.h>

#include <asm/io.h>

#include <asm/fpu.h>



/* The PR (precision) bit in the FP Status Register must be clear when

 * an frchg instruction is executed, otherwise the instruction is undefined.

arch/sh/kernel/cpu/sh4/fpu.c

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

#include <asm/processor.h>

#include <asm/system.h>

#include <asm/fpu.h>



/* The PR (precision) bit in the FP Status Register must be clear when

 * an frchg instruction is executed, otherwise the instruction is undefined.

arch/sh/kernel/cpu/sh5/fpu.c

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

#include <asm/user.h>

#include <asm/io.h>

#include <asm/fpu.h>



/*

 * Initially load the FPU with signalling NANS.  This bit pattern