[PATCH] frv: miscellaneous changes

Fix a number of miscellanous items: (1) Declare lock sections in the linker script. (2) Recurse in the correct manner in the arch makefile. (3) asm/bug.h requires asm/linkage.h to be included first. One C file puts asm/bug.h first. (4) Add an empty RTC header file to avoid missing header file errors. (5) sg_dma_address() should use the dma_address member of a scatter list. (6) Add trivial pci_unmap support. (7) Add pgprot_noncached() (8) Discard u_quad_t. (9) Use ~0UL rather than ULONG_MAX in unistd.h in case the latter isn't declared. (10) Add an empty VGA header file to avoid missing header file errors. (11) Add an XOR header file to use the generic XOR stuff. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] frv: miscellaneous changes
Fix a number of miscellanous items: (1) Declare lock sections in the linker script. (2) Recurse in the correct manner in the arch makefile. (3) asm/bug.h requires asm/linkage.h to be included first. One C file puts asm/bug.h first. (4) Add an empty RTC header file to avoid missing header file errors. (5) sg_dma_address() should use the dma_address member of a scatter list. (6) Add trivial pci_unmap support. (7) Add pgprot_noncached() (8) Discard u_quad_t. (9) Use ~0UL rather than ULONG_MAX in unistd.h in case the latter isn't declared. (10) Add an empty VGA header file to avoid missing header file errors. (11) Add an XOR header file to use the generic XOR stuff. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Howells · Linus Torvalds
1 parent 5c15d41bab
Showing 11 changed files with 54 additions and 6 deletions Side-by-side Diff
arch/frv/Makefile
arch/frv/kernel/vmlinux.lds.S
include/asm-frv/bug.h
include/asm-frv/dma-mapping.h
include/asm-frv/mc146818rtc.h
include/asm-frv/pci.h
include/asm-frv/pgtable.h
include/asm-frv/types.h
include/asm-frv/unistd.h
include/asm-frv/vga.h
include/asm-frv/xor.h
@@ -109,11 +109,11 @@
 	$(Q)$(MAKEBOOT) bootstrap
  
 archmrproper:
-	$(Q)$(MAKE) -C arch/frv/boot mrproper
+	$(Q)$(MAKE) $(build)=arch/frv/boot mrproper
  
 archclean:
-	$(Q)$(MAKE) -C arch/frv/boot clean
+	$(Q)$(MAKE) $(build)=arch/frv/boot clean
  
 archdep: scripts/mkdep symlinks
-	$(Q)$(MAKE) -C arch/frv/boot dep
+	$(Q)$(MAKE) $(build)=arch/frv/boot dep
@@ -112,6 +112,7 @@
 #endif
 	)
 	SCHED_TEXT
+	LOCK_TEXT
 	*(.fixup)
 	*(.gnu.warning)
 	*(.exitcall.exit)
@@ -12,6 +12,7 @@
 #define _ASM_BUG_H
  
 #include <linux/config.h>
+#include <linux/linkage.h>
  
 #ifdef CONFIG_BUG
 /*
@@ -23,7 +23,7 @@
  * returns, or alternatively stop on the first sg_dma_len(sg) which
  * is 0.
  */
-#define sg_dma_address(sg)	((unsigned long) (page_to_phys((sg)->page) + (sg)->offset))
+#define sg_dma_address(sg)	((sg)->dma_address)
 #define sg_dma_len(sg)		((sg)->length)
  
 /*
+/* mc146818rtc.h: RTC defs
+ *
+ * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _ASM_MC146818RTC_H
+#define _ASM_MC146818RTC_H
+
+
+#endif /* _ASM_MC146818RTC_H */
@@ -57,6 +57,14 @@
  */
 #define PCI_DMA_BUS_IS_PHYS	(1)
  
+/* pci_unmap_{page,single} is a nop so... */
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
+
 #ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 					enum pci_dma_burst_strategy *strat,
@@ -421,6 +421,11 @@
 }
  
 /*
+ * Macro to mark a page protection value as "uncacheable"
+ */
+#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NOCACHE))
+
+/*
  * Conversion functions: convert a page and protection to a page entry,
  * and a page entry and page directory to the page they refer to.
  */
@@ -59,7 +59,6 @@
  
 typedef signed long long s64;
 typedef unsigned long long u64;
-typedef u64 u_quad_t;
  
 /* Dma addresses are 32-bits wide.  */
  
@@ -313,7 +313,7 @@
         unsigned long __sr2 = (res);					\
 	if (__builtin_expect(__sr2 >= (unsigned long)(-4095), 0)) {	\
 		errno = (-__sr2);					\
-		__sr2 = ULONG_MAX;					\
+		__sr2 = ~0UL;						\
 	}								\
 	return (type) __sr2;						\
 } while (0)
+/* vga.h: VGA register stuff
+ *
+ * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _ASM_VGA_H
+#define _ASM_VGA_H
+
+
+
+#endif /* _ASM_VGA_H */
+#include <asm-generic/xor.h>
...	...	@@ -109,11 +109,11 @@
109	109	$(Q)$(MAKEBOOT) bootstrap
110	110
111	111	archmrproper:
112		- $(Q)$(MAKE) -C arch/frv/boot mrproper
	112	+ $(Q)$(MAKE) $(build)=arch/frv/boot mrproper
113	113
114	114	archclean:
115		- $(Q)$(MAKE) -C arch/frv/boot clean
	115	+ $(Q)$(MAKE) $(build)=arch/frv/boot clean
116	116
117	117	archdep: scripts/mkdep symlinks
118		- $(Q)$(MAKE) -C arch/frv/boot dep
	118	+ $(Q)$(MAKE) $(build)=arch/frv/boot dep
...	...	@@ -112,6 +112,7 @@
112	112	#endif
113	113	)
114	114	SCHED_TEXT
	115	+ LOCK_TEXT
115	116	*(.fixup)
116	117	*(.gnu.warning)
117	118	*(.exitcall.exit)
...	...	@@ -12,6 +12,7 @@
12	12	#define _ASM_BUG_H
13	13
14	14	#include <linux/config.h>
	15	+#include <linux/linkage.h>
15	16
16	17	#ifdef CONFIG_BUG
17	18	/*
...	...	@@ -23,7 +23,7 @@
23	23	* returns, or alternatively stop on the first sg_dma_len(sg) which
24	24	* is 0.
25	25	*/
26		-#define sg_dma_address(sg) ((unsigned long) (page_to_phys((sg)->page) + (sg)->offset))
	26	+#define sg_dma_address(sg) ((sg)->dma_address)
27	27	#define sg_dma_len(sg) ((sg)->length)
28	28
29	29	/*
	1	+/* mc146818rtc.h: RTC defs
	2	+ *
	3	+ * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
	4	+ * Written by David Howells (dhowells@redhat.com)
	5	+ *
	6	+ * This program is free software; you can redistribute it and/or
	7	+ * modify it under the terms of the GNU General Public License
	8	+ * as published by the Free Software Foundation; either version
	9	+ * 2 of the License, or (at your option) any later version.
	10	+ */
	11	+
	12	+#ifndef _ASM_MC146818RTC_H
	13	+#define _ASM_MC146818RTC_H
	14	+
	15	+
	16	+#endif /* _ASM_MC146818RTC_H */
...	...	@@ -57,6 +57,14 @@
57	57	*/
58	58	#define PCI_DMA_BUS_IS_PHYS (1)
59	59
	60	+/* pci_unmap_{page,single} is a nop so... */
	61	+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
	62	+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
	63	+#define pci_unmap_addr(PTR, ADDR_NAME) (0)
	64	+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
	65	+#define pci_unmap_len(PTR, LEN_NAME) (0)
	66	+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
	67	+
60	68	#ifdef CONFIG_PCI
61	69	static inline void pci_dma_burst_advice(struct pci_dev *pdev,
62	70	enum pci_dma_burst_strategy *strat,
...	...	@@ -421,6 +421,11 @@
421	421	}
422	422
423	423	/*
	424	+ * Macro to mark a page protection value as "uncacheable"
	425	+ */
	426	+#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) \| _PAGE_NOCACHE))
	427	+
	428	+/*
424	429	* Conversion functions: convert a page and protection to a page entry,
425	430	* and a page entry and page directory to the page they refer to.
426	431	*/
...	...	@@ -59,7 +59,6 @@
59	59
60	60	typedef signed long long s64;
61	61	typedef unsigned long long u64;
62		-typedef u64 u_quad_t;
63	62
64	63	/* Dma addresses are 32-bits wide. */
65	64
...	...	@@ -313,7 +313,7 @@
313	313	unsigned long __sr2 = (res); \
314	314	if (__builtin_expect(__sr2 >= (unsigned long)(-4095), 0)) { \
315	315	errno = (-__sr2); \
316		- __sr2 = ULONG_MAX; \
	316	+ __sr2 = ~0UL; \
317	317	} \
318	318	return (type) __sr2; \
319	319	} while (0)
	1	+/* vga.h: VGA register stuff
	2	+ *
	3	+ * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
	4	+ * Written by David Howells (dhowells@redhat.com)
	5	+ *
	6	+ * This program is free software; you can redistribute it and/or
	7	+ * modify it under the terms of the GNU General Public License
	8	+ * as published by the Free Software Foundation; either version
	9	+ * 2 of the License, or (at your option) any later version.
	10	+ */
	11	+
	12	+#ifndef _ASM_VGA_H
	13	+#define _ASM_VGA_H
	14	+
	15	+
	16	+
	17	+#endif /* _ASM_VGA_H */