Merge branch 'master' into sh/hw-breakpoints

Browse source

Conflict between FPU thread flag migration and debug
thread flag addition.

Conflicts:
	arch/sh/include/asm/thread_info.h
	arch/sh/include/asm/ubc.h
	arch/sh/kernel/process_32.c

...

This commit is contained in:

Paul Mundt 2009-12-08 15:47:12 +09:00

parent 09a0729477 6a5a0b9139

commit 6424db52e2

149 changed files with 5895 additions and 3558 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

29

arch/sh/Kconfig

View file

4

arch/sh/Makefile

View file

1

arch/sh/boards/Makefile

View file

2

arch/sh/boards/mach-ap325rxa/Makefile

View file

69

arch/sh/boards/mach-ap325rxa/sdram.S

View file

97

arch/sh/boards/board-ap325rxa.c → arch/sh/boards/mach-ap325rxa/setup.c

View file

2

arch/sh/boards/mach-ecovec24/Makefile

View file

52

arch/sh/boards/mach-ecovec24/sdram.S

View file

197

arch/sh/boards/mach-ecovec24/setup.c

View file

2

arch/sh/boards/mach-highlander/setup.c

View file

2

arch/sh/boards/mach-kfr2r09/Makefile

View file

80

arch/sh/boards/mach-kfr2r09/sdram.S

View file

238

arch/sh/boards/mach-kfr2r09/setup.c

View file

2

arch/sh/boards/mach-migor/Makefile

View file

69

arch/sh/boards/mach-migor/sdram.S

View file

65

arch/sh/boards/mach-migor/setup.c

View file

2

arch/sh/boards/mach-r2d/irq.c

View file

32

arch/sh/boards/mach-se/7722/irq.c

View file

17

arch/sh/boards/mach-se/7722/setup.c

View file

2

arch/sh/boards/mach-se/7724/Makefile

View file

52

arch/sh/boards/mach-se/7724/sdram.S

View file

96

arch/sh/boards/mach-se/7724/setup.c

View file

2

arch/sh/boot/compressed/misc.c

View file

12

arch/sh/boot/romimage/Makefile

View file

38

arch/sh/boot/romimage/head.S

View file

2

arch/sh/drivers/dma/dma-sysfs.c

View file

19

arch/sh/drivers/pci/Kconfig

View file

9

arch/sh/include/asm/addrspace.h

View file

9

arch/sh/include/asm/atomic.h

View file

4

arch/sh/include/asm/bitops.h

View file

4

arch/sh/include/asm/bugs.h

View file

239

arch/sh/include/asm/dma-mapping.h

View file

28

arch/sh/include/asm/dwarf.h

View file

12

arch/sh/include/asm/fixmap.h

View file

26

arch/sh/include/asm/fpu.h

View file

17

arch/sh/include/asm/ftrace.h

View file

82

arch/sh/include/asm/gpio.h

View file

13

arch/sh/include/asm/hardirq.h

View file

16

arch/sh/include/asm/io.h

View file

31

arch/sh/include/asm/irqflags.h

View file

99

arch/sh/include/asm/irqflags_32.h

View file

85

arch/sh/include/asm/irqflags_64.h

View file

13

arch/sh/include/asm/mmu.h

View file

30

arch/sh/include/asm/pci.h

View file

31

arch/sh/include/asm/perf_event.h

View file

26

arch/sh/include/asm/pgtable.h

View file

2

arch/sh/include/asm/pgtable_32.h

View file

3

arch/sh/include/asm/processor_32.h

View file

2

arch/sh/include/asm/scatterlist.h

View file

65

arch/sh/include/asm/suspend.h

View file

4

arch/sh/include/asm/system.h

View file

29

arch/sh/include/asm/system_32.h

View file

26

arch/sh/include/asm/system_64.h

View file

30

arch/sh/include/asm/thread_info.h

View file

8

arch/sh/include/asm/topology.h

View file

11

arch/sh/include/asm/ubc.h

View file

59

arch/sh/include/asm/watchdog.h

View file

13

arch/sh/include/cpu-sh4/cpu/watchdog.h

View file

3

arch/sh/include/mach-ecovec24/mach/partner-jet-setup.txt

View file

11

arch/sh/include/mach-se/mach/se7722.h

View file

10

arch/sh/kernel/Makefile

View file

23

arch/sh/kernel/asm-offsets.c

View file

1

arch/sh/kernel/cpu/Makefile

View file

28

arch/sh/kernel/cpu/init.c

View file

27

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

View file

33

arch/sh/kernel/cpu/sh3/entry.S

View file

8

arch/sh/kernel/cpu/sh4/Makefile

View file

28

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

View file

253

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

View file

1

arch/sh/kernel/cpu/sh4a/Makefile

View file

2

arch/sh/kernel/cpu/sh4a/clock-sh7724.c

View file

269

arch/sh/kernel/cpu/sh4a/perf_event.c

View file

264

arch/sh/kernel/cpu/sh4a/setup-sh7724.c

View file

45

arch/sh/kernel/cpu/sh4a/setup-shx3.c

View file

37

arch/sh/kernel/cpu/sh4a/smp-shx3.c

View file

2

arch/sh/kernel/cpu/sh5/entry.S

View file

42

arch/sh/kernel/cpu/shmobile/cpuidle.c

View file

117

arch/sh/kernel/cpu/shmobile/pm.c

View file

17

arch/sh/kernel/cpu/shmobile/pm_runtime.c

View file

342

arch/sh/kernel/cpu/shmobile/sleep.S

View file

59

arch/sh/kernel/cpu/ubc.S

View file

82

arch/sh/kernel/dma-nommu.c

View file

260

arch/sh/kernel/dwarf.c

View file

2

arch/sh/kernel/entry-common.S

View file

146

arch/sh/kernel/ftrace.c

View file

2

arch/sh/kernel/head_32.S

View file

96

arch/sh/kernel/idle.c

View file

4

arch/sh/kernel/io_generic.c

View file

14

arch/sh/kernel/irq.c

View file

57

arch/sh/kernel/irq_32.c

View file

51

arch/sh/kernel/irq_64.c

View file

6

arch/sh/kernel/machine_kexec.c

View file

4

arch/sh/kernel/machvec.c

View file

9

arch/sh/kernel/module.c

View file

98

arch/sh/kernel/perf_callchain.c

View file

312

arch/sh/kernel/perf_event.c

View file

43

arch/sh/kernel/process_32.c

View file

2

arch/sh/kernel/process_64.c

View file

54

arch/sh/kernel/return_address.c

View file

4

arch/sh/kernel/setup.c

View file

Some files were not shown because too many files have changed in this diff Show more