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

Commit 20a9e57a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-4.19' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux 

Pull arch/h8300 updates from Yoshinori Sato.

* tag 'for-4.19' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
  h8300: fix IRQ no
  arch/h8300: add a defconfig target
  arch/h8300: eliminate kgbd.c warning
  arch/h8300: eliminate ptrace.h warnings
  h8300:let the checker know that size_t is ulong
  h8300: Don't include linux/kernel.h in asm/atomic.h
  h8300: remove unnecessary of_platform_populate call
  h8300: Correct signature of test_bit()
  h8300: irqchip: fix warning
  h8300: switch to NO_BOOTMEM
  h8300: gcc-8.1 fix
  h8300: Add missing output register.
parents ad1d6973 4bdf61cc

arch/h8300/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config H8300 
	select OF_IRQ

	select OF_EARLY_FLATTREE

	select HAVE_MEMBLOCK

	select NO_BOOTMEM

	select TIMER_OF

	select H8300_TMR8

	select HAVE_KERNEL_GZIP

arch/h8300/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
# (C) Copyright 2002-2015 Yoshinori Sato <ysato@users.sourceforge.jp>

#



KBUILD_DEFCONFIG := edosk2674_defconfig



cflags-$(CONFIG_CPU_H8300H)	:= -mh

aflags-$(CONFIG_CPU_H8300H)	:= -mh -Wa,--mach=h8300h

ldflags-$(CONFIG_CPU_H8300H)	:= -mh8300helf_linux
@@ -22,6 +24,8 @@ KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\" 
KBUILD_AFLAGS += $(aflags-y)

LDFLAGS += $(ldflags-y)



CHECKFLAGS += -msize-long



ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE := h8300-unknown-linux-

endif

arch/h8300/boot/dts/h8300h_sim.dts

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
	timer16: timer@ffff68 {

		compatible = "renesas,16bit-timer";

		reg = <0xffff68 8>, <0xffff60 8>;

		interrupts = <24 0>;

		interrupts = <26 0>;

		renesas,channel = <0>;

		clocks = <&fclk>;

		clock-names = "fck";

arch/h8300/include/asm/bitops.h

+7 −7
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ static inline unsigned long ffz(unsigned long word) 


	result = -1;

	__asm__("1:\n\t"

		"shlr.l %2\n\t"

		"shlr.l %1\n\t"

		"adds #1,%0\n\t"

		"bcs 1b"

		: "=r"(result)

		: "0"(result), "r"(word));

		: "=r"(result),"=r"(word)

		: "0"(result), "1"(word));

	return result;

}
@@ -66,7 +66,7 @@ H8300_GEN_BITOP(change_bit, "bnot") 


#undef H8300_GEN_BITOP



static inline int test_bit(int nr, const unsigned long *addr)

static inline int test_bit(int nr, const volatile unsigned long *addr)

{

	int ret = 0;

	unsigned char *b_addr;
@@ -162,11 +162,11 @@ static inline unsigned long __ffs(unsigned long word) 


	result = -1;

	__asm__("1:\n\t"

		"shlr.l %2\n\t"

		"shlr.l %1\n\t"

		"adds #1,%0\n\t"

		"bcc 1b"

		: "=r" (result)

		: "0"(result), "r"(word));

		: "=r" (result),"=r"(word)

		: "0"(result), "1"(word));

	return result;

}

arch/h8300/include/asm/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


#include <uapi/asm/ptrace.h>



struct task_struct;



#ifndef __ASSEMBLY__

#ifndef PS_S

#define PS_S  (0x10)