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

Commit 41be6aef authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5c15d41b

arch/frv/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -109,10 +109,10 @@ bootstrap: 
	$(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

arch/frv/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ SECTIONS 
#endif

	)

	SCHED_TEXT

	LOCK_TEXT

	*(.fixup)

	*(.gnu.warning)

	*(.exitcall.exit)

include/asm-frv/bug.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define _ASM_BUG_H



#include <linux/config.h>

#include <linux/linkage.h>



#ifdef CONFIG_BUG

/*

include/asm-frv/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t 
 * 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)



/*

include/asm-frv/mc146818rtc.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/* 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 */