Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16875
b: refs/heads/master
c: 41be6ae
h: refs/heads/master
i:
  16873: c5bf35f
  16871: 759b605
v: v3
  • Loading branch information
David Howells authored and Linus Torvalds committed Jan 9, 2006
1 parent 1fdf4e4 commit c5a1342
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5c15d41bab185431a9a28982b5aaac251dde4556
refs/heads/master: 41be6aef38c08f1f85ac1c4bd8191b0d1ec61b4c
6 changes: 3 additions & 3 deletions trunk/arch/frv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions trunk/arch/frv/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ SECTIONS
#endif
)
SCHED_TEXT
LOCK_TEXT
*(.fixup)
*(.gnu.warning)
*(.exitcall.exit)
Expand Down
1 change: 1 addition & 0 deletions trunk/include/asm-frv/bug.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#define _ASM_BUG_H

#include <linux/config.h>
#include <linux/linkage.h>

#ifdef CONFIG_BUG
/*
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-frv/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

/*
Expand Down
16 changes: 16 additions & 0 deletions trunk/include/asm-frv/mc146818rtc.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* 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 */
8 changes: 8 additions & 0 deletions trunk/include/asm-frv/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
*/
#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,
Expand Down
5 changes: 5 additions & 0 deletions trunk/include/asm-frv/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,11 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
asm volatile("dcf %M0" :: "U"(*ptep));
}

/*
* 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.
Expand Down
1 change: 0 additions & 1 deletion trunk/include/asm-frv/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ typedef unsigned int u32;

typedef signed long long s64;
typedef unsigned long long u64;
typedef u64 u_quad_t;

/* Dma addresses are 32-bits wide. */

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-frv/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ do { \
unsigned long __sr2 = (res); \
if (__builtin_expect(__sr2 >= (unsigned long)(-4095), 0)) { \
errno = (-__sr2); \
__sr2 = ULONG_MAX; \
__sr2 = ~0UL; \
} \
return (type) __sr2; \
} while (0)
Expand Down
17 changes: 17 additions & 0 deletions trunk/include/asm-frv/vga.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* 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 */
1 change: 1 addition & 0 deletions trunk/include/asm-frv/xor.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <asm-generic/xor.h>

0 comments on commit c5a1342

Please sign in to comment.