lkml.org 
[lkml]   [2010]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [git pull] h8300 update
- add ioread/write macros
- add missing header include
- add __clear_user
- move die definition

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
arch/h8300/Makefile | 2 --
arch/h8300/include/asm/io.h | 7 +++++++
arch/h8300/include/asm/pgtable.h | 2 ++
arch/h8300/include/asm/system.h | 2 --
arch/h8300/include/asm/uaccess.h | 3 ++-
arch/h8300/kernel/time.c | 1 +
arch/h8300/mm/fault.c | 2 ++
arch/h8300/platform/h8300h/generic/Makefile | 2 +-
8 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index a556447..7486ea9 100644
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -41,8 +41,6 @@ LDFLAGS += $(ldflags-y)
CROSS_COMPILE = h8300-elf-
LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

-head-y := arch/$(ARCH)/platform/$(PLATFORM)/$(BOARD)/crt0_$(MODEL).o
-
core-y += arch/$(ARCH)/kernel/ \
arch/$(ARCH)/mm/
ifdef PLATFORM
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h
index 33e842f..a16f15e 100644
--- a/arch/h8300/include/asm/io.h
+++ b/arch/h8300/include/asm/io.h
@@ -233,6 +233,13 @@ static inline void io_insl_noswap(unsigned int addr, void *buf, int len)
#define insw(a,b,l) io_insw(a,b,l)
#define insl(a,b,l) io_insl(a,b,l)

+#define ioread8(a) __raw_readb(a)
+#define ioread16(a) __raw_readw(a)
+#define ioread32(a) __raw_readl(a)
+
+#define iowrite8(v,a) __raw_writeb((v),(a))
+#define iowrite16(v,a) __raw_writew((v),(a))
+#define iowrite32(v,a) __raw_writel((v),(a))
#define IO_SPACE_LIMIT 0xffffff


diff --git a/arch/h8300/include/asm/pgtable.h b/arch/h8300/include/asm/pgtable.h
index a09230a..0755116 100644
--- a/arch/h8300/include/asm/pgtable.h
+++ b/arch/h8300/include/asm/pgtable.h
@@ -70,4 +70,6 @@ extern int is_in_rom(unsigned long);
#define VMALLOC_END 0xffffffff

#define arch_enter_lazy_cpu_mode() do {} while (0)
+
+#include <asm-generic/pgtable.h>
#endif /* _H8300_PGTABLE_H */
diff --git a/arch/h8300/include/asm/system.h b/arch/h8300/include/asm/system.h
index d98d976..4b8e475 100644
--- a/arch/h8300/include/asm/system.h
+++ b/arch/h8300/include/asm/system.h
@@ -155,6 +155,4 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz

#define arch_align_stack(x) (x)

-void die(char *str, struct pt_regs *fp, unsigned long err);
-
#endif /* _H8300_SYSTEM_H */
diff --git a/arch/h8300/include/asm/uaccess.h b/arch/h8300/include/asm/uaccess.h
index 356068c..352c193 100644
--- a/arch/h8300/include/asm/uaccess.h
+++ b/arch/h8300/include/asm/uaccess.h
@@ -153,10 +153,11 @@ static inline long strnlen_user(const char *src, long n)
*/

static inline unsigned long
-clear_user(void *to, unsigned long n)
+__clear_user(void *to, unsigned long n)
{
memset(to, 0, n);
return 0;
}
+#define clear_user(to, size) __clear_user(to, size)

#endif /* _H8300_UACCESS_H */
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index 7f2d6cf..259afa5 100644
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -28,6 +28,7 @@

#include <asm/io.h>
#include <asm/timer.h>
+#include <asm/irq_regs.h>

#define TICK_SIZE (tick_nsec / 1000)

diff --git a/arch/h8300/mm/fault.c b/arch/h8300/mm/fault.c
index 1d092ab..47f2ced 100644
--- a/arch/h8300/mm/fault.c
+++ b/arch/h8300/mm/fault.c
@@ -20,6 +20,8 @@
#include <asm/system.h>
#include <asm/pgtable.h>

+void die(char *str, struct pt_regs *fp, unsigned long err);
+
/*
* This routine handles page faults. It determines the problem, and
* then passes it off to one of the appropriate routines.
diff --git a/arch/h8300/platform/h8300h/generic/Makefile b/arch/h8300/platform/h8300h/generic/Makefile
index 2b12a17..aaed304 100644
--- a/arch/h8300/platform/h8300h/generic/Makefile
+++ b/arch/h8300/platform/h8300h/generic/Makefile
@@ -2,4 +2,4 @@
# Makefile for the linux kernel.
#

-extra-y := crt0_$(MODEL).o
+obj-y := crt0_$(MODEL).o
--
1.6.5.3

\
 
 \ /
  Last update: 2010-01-11 06:33    [W:0.038 / U:3.512 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site