From 95f40de9df68dd4f618fb4fd141d2471b5ab017a Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 12 Feb 2013 10:37:14 +0100 Subject: cris: Provide In file included from include/linux/kvm_para.h:4:0, from kernel/watchdog.c:28: include/uapi/linux/kvm_para.h:26:26: fatal error: asm/kvm_para.h: No such file or directory Signed-off-by: Geert Uytterhoeven --- arch/cris/include/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/cris/include') diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index f1e79edc9dd..74784882e22 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -5,5 +5,6 @@ header-y += arch-v32/ generic-y += clkdev.h generic-y += exec.h +generic-y += kvm_para.h generic-y += module.h generic-y += trace_clock.h -- cgit v1.2.3 From 0dad16fd4e61b2d3a22ef0ea15ba8369bacf090a Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 12 Feb 2013 10:45:35 +0100 Subject: cris: Provide inb_p() and outb_p() drivers/block/hd.c: In function 'check_status': drivers/block/hd.c:256:2: error: implicit declaration of function 'inb_p' [-Werror=implicit-function-declaration] drivers/block/hd.c: In function 'controller_ready': drivers/block/hd.c:297:3: error: implicit declaration of function 'outb_p' [-Werror=implicit-function-declaration] Signed-off-by: Geert Uytterhoeven --- arch/cris/include/asm/io.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/cris/include') diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h index ac12ae2b928..5d3047e5563 100644 --- a/arch/cris/include/asm/io.h +++ b/arch/cris/include/asm/io.h @@ -167,6 +167,9 @@ static inline void outsl(unsigned int port, const void *addr, cris_iops->write_io(port, (void *)addr, 4, count); } +#define inb_p(port) inb(port) +#define outb_p(val, port) outb((val), (port)) + /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access -- cgit v1.2.3 From decd48ccbe6d5a883f400b7b9b797ab7fe228c0d Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 7 May 2013 10:08:34 +0200 Subject: cris: Switch to asm-generic/linkage.h Signed-off-by: Geert Uytterhoeven Acked-by: Jesper Nilsson --- arch/cris/include/asm/Kbuild | 1 + arch/cris/include/asm/linkage.h | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 arch/cris/include/asm/linkage.h (limited to 'arch/cris/include') diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 74784882e22..1e7dfadb837 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -6,5 +6,6 @@ header-y += arch-v32/ generic-y += clkdev.h generic-y += exec.h generic-y += kvm_para.h +generic-y += linkage.h generic-y += module.h generic-y += trace_clock.h diff --git a/arch/cris/include/asm/linkage.h b/arch/cris/include/asm/linkage.h deleted file mode 100644 index 291c2d01c44..00000000000 --- a/arch/cris/include/asm/linkage.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_LINKAGE_H -#define __ASM_LINKAGE_H - -/* Nothing to see here... */ - -#endif -- cgit v1.2.3 From cd07f4f3bb9744034693ff012f640bcacaf5c1c6 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 14 May 2013 09:25:52 +0200 Subject: cris: Wire up asm-generic/xor.h crypto/xor.c:25:21: fatal error: asm/xor.h: No such file or directory Signed-off-by: Geert Uytterhoeven Acked-by: Jesper Nilsson --- arch/cris/include/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/cris/include') diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 1e7dfadb837..0dd4b88a5c7 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -9,3 +9,4 @@ generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h generic-y += trace_clock.h +generic-y += xor.h -- cgit v1.2.3 From e3ccbc3444b8c8119e63934aeea0c651ed1c41a0 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 15 May 2013 22:38:12 +0200 Subject: cris: Wire up asm-generic/vga.h When compiling several DRM related files: include/video/vga.h:22:21: fatal error: asm/vga.h: No such file or directory Signed-off-by: Geert Uytterhoeven --- arch/cris/include/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/cris/include') diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 0dd4b88a5c7..c8325455520 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -9,4 +9,5 @@ generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h generic-y += trace_clock.h +generic-y += vga.h generic-y += xor.h -- cgit v1.2.3