Skip to content

Commit c59cebe

Browse files
committed
Merge tag 'sh-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz: "The majority of improvements are coming from Geert Uytterhoeven who took the time to fix a total of 30 cases of "-Wmissing-prototypes" compiler warnings, either by adding a missing header include, defining the missing forward declarations or making the functions in question static. In the case of several DMA functions, the fix was to actually just remove them as they were added but never used. Another one of these warnings was eliminated by removing the left-over sh5 cache handling support, a change that was suggested by Yoshinori Sato and, finally, the last of these warnings was fixed by guarding the function setup_profiling_timer() with CONFIG_PROFILING. While at it, Geert also removed two unneeded casts to kprobe_opcode_t in the kprobes code. Another change was contributed by Guenter Roeck to fix errors that were reported during checksum unit tests. The fix actually reverts the older change cadc4e1 ("sh: Handle calling csum_partial with misaligned data") which turned to be incorrect. It remains to be investigated whether there is a better way to handle misaligned data in csum_partial(). A small fix contributed by Krzysztof Kozlowski drops the incorrect SPI controller spi-max-frequency property in the device tree source file for the J2 device platform while Uwe Kleine-König converted the push-switch driver to have its callback function return void, a change that is currently being applied to all drivers throughout the kernel in order to avoid resource leaks. Last but not least, Artur Rojek has fixed the IOPORT base address for the Sega Dreamcast platform which allows the Linux kernel to be successfully booted on this once popular video game console for the first time since a long time ago" * tag 'sh-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: (35 commits) sh: setup: Add missing forward declaration for sh_fdt_init() sh: smp: Protect setup_profiling_timer() by CONFIG_PROFILING sh: of-generic: Add missing #include <asm/clock.h> sh: dreamcast: Fix GAPS PCI bridge addressing sh: boot: Add proper forward declarations sh: boot: Remove sh5 cache handling Revert "sh: Handle calling csum_partial with misaligned data" sh: j2: Drop incorrect SPI controller spi-max-frequency property sh: push-switch: Convert to platform remove callback returning void sh: sh7785lcr: Make init_sh7785lcr_IRQ() static sh: sh7757: Add missing #include <asm/mmzone.h> sh: sh7757lcr: Make init_sh7757lcr_IRQ() static sh: mach-sh03: Make sh03_rtc_settimeofday() static sh: mach-highlander: Add missing #include <mach/highlander.h> sh: traps: Make is_dsp_inst() static sh: cache: Move forward declarations to <asm/cacheflush.h> sh: dma: Remove unused functionality sh: dwarf: Make dwarf_lookup_fde() static sh: kprobes: Remove unneeded kprobe_opcode_t casts sh: kprobes: Make trampoline_probe_handler() static ...
2 parents 103916f + efe976b commit c59cebe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+111
-282
lines changed

arch/sh/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ config ARCH_HAS_ILOG2_U64
125125

126126
config NO_IOPORT_MAP
127127
def_bool !PCI
128-
depends on !SH_SHMIN && !SH_HP6XX && !SH_SOLUTION_ENGINE
128+
depends on !SH_SHMIN && !SH_HP6XX && !SH_SOLUTION_ENGINE && \
129+
!SH_DREAMCAST
129130

130131
config IO_TRAPPED
131132
bool

arch/sh/boards/board-sh7757lcr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ static int __init sh7757lcr_devices_setup(void)
569569
arch_initcall(sh7757lcr_devices_setup);
570570

571571
/* Initialize IRQ setting */
572-
void __init init_sh7757lcr_IRQ(void)
572+
static void __init init_sh7757lcr_IRQ(void)
573573
{
574574
plat_irq_setup_pins(IRQ_MODE_IRQ7654);
575575
plat_irq_setup_pins(IRQ_MODE_IRQ3210);

arch/sh/boards/board-sh7785lcr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static int __init sh7785lcr_devices_setup(void)
295295
device_initcall(sh7785lcr_devices_setup);
296296

297297
/* Initialize IRQ setting */
298-
void __init init_sh7785lcr_IRQ(void)
298+
static void __init init_sh7785lcr_IRQ(void)
299299
{
300300
plat_irq_setup_pins(IRQ_MODE_IRQ7654);
301301
plat_irq_setup_pins(IRQ_MODE_IRQ3210);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525
#include <asm/irq.h>
2626
#include <asm/rtc.h>
2727
#include <asm/machvec.h>
28+
#include <cpu/addrspace.h>
2829
#include <mach/sysasic.h>
2930

3031
static void __init dreamcast_setup(char **cmdline_p)
3132
{
33+
/* GAPS PCI bridge assumes P2 area relative addresses. */
34+
__set_io_port_base(P2SEG);
3235
}
3336

3437
static struct sh_machine_vector mv_dreamcast __initmv = {

arch/sh/boards/mach-highlander/pinmux-r7785rp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <linux/init.h>
66
#include <linux/gpio.h>
77
#include <cpu/sh7785.h>
8+
#include <mach/highlander.h>
89

910
void __init highlander_plat_pinmux_setup(void)
1011
{

arch/sh/boards/mach-sh03/rtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static int set_rtc_mmss(struct rtc_time *tm)
120120
return retval;
121121
}
122122

123-
int sh03_rtc_settimeofday(struct device *dev, struct rtc_time *tm)
123+
static int sh03_rtc_settimeofday(struct device *dev, struct rtc_time *tm)
124124
{
125125
return set_rtc_mmss(tm);
126126
}

arch/sh/boards/of-generic.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include <linux/of_fdt.h>
1111
#include <linux/clocksource.h>
1212
#include <linux/irqchip.h>
13+
14+
#include <asm/clock.h>
1315
#include <asm/machvec.h>
1416
#include <asm/rtc.h>
1517

arch/sh/boot/compressed/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# create a compressed vmlinux image from the original vmlinux
66
#
77

8-
OBJECTS := head_32.o misc.o cache.o piggy.o \
8+
OBJECTS := head_32.o misc.o piggy.o \
99
ashiftrt.o ashldi3.o ashrsi3.o ashlsi3.o lshrsi3.o
1010

1111
targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \

arch/sh/boot/compressed/cache.c

Lines changed: 0 additions & 13 deletions
This file was deleted.

arch/sh/boot/compressed/misc.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include <asm/addrspace.h>
1717
#include <asm/page.h>
1818

19+
#include "misc.h"
20+
1921
/*
2022
* gzip declarations
2123
*/
@@ -26,11 +28,6 @@
2628
#undef memcpy
2729
#define memzero(s, n) memset ((s), 0, (n))
2830

29-
/* cache.c */
30-
#define CACHE_ENABLE 0
31-
#define CACHE_DISABLE 1
32-
int cache_control(unsigned int command);
33-
3431
extern char input_data[];
3532
extern int input_len;
3633
static unsigned char *output;
@@ -139,8 +136,6 @@ void decompress_kernel(void)
139136
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
140137

141138
puts("Uncompressing Linux... ");
142-
cache_control(CACHE_ENABLE);
143139
__decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error);
144-
cache_control(CACHE_DISABLE);
145140
puts("Ok, booting the kernel.\n");
146141
}

0 commit comments

Comments
 (0)