Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42944
b: refs/heads/master
c: 219576e
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Dec 7, 2006
1 parent 4d2bc73 commit 25f09dd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 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: bb8cc641653d785e3f3b8d3b0182a69edf825802
refs/heads/master: 219576e127c4f7770aa985f719e815936bc54367
4 changes: 2 additions & 2 deletions trunk/include/asm-h8300/delay.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Delay routines, using a pre-computed "loops_per_second" value.
*/

extern __inline__ void __delay(unsigned long loops)
static inline void __delay(unsigned long loops)
{
__asm__ __volatile__ ("1:\n\t"
"dec.l #1,%0\n\t"
Expand All @@ -27,7 +27,7 @@ extern __inline__ void __delay(unsigned long loops)

extern unsigned long loops_per_jiffy;

extern __inline__ void udelay(unsigned long usecs)
static inline void udelay(unsigned long usecs)
{
usecs *= 4295; /* 2**32 / 1000000 */
usecs /= (loops_per_jiffy*HZ);
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/asm-h8300/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
}

extern inline int
static inline int
init_new_context(struct task_struct *tsk, struct mm_struct *mm)
{
// mm->context = virt_to_phys(mm->pgd);
Expand All @@ -23,7 +23,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str
{
}

extern inline void activate_mm(struct mm_struct *prev_mm,
static inline void activate_mm(struct mm_struct *prev_mm,
struct mm_struct *next_mm)
{
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/asm-h8300/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#define pcibios_assign_all_busses() 0
#define pcibios_scan_all_fns(a, b) 0

extern inline void pcibios_set_master(struct pci_dev *dev)
static inline void pcibios_set_master(struct pci_dev *dev)
{
/* No special bus mastering setup handling */
}

extern inline void pcibios_penalize_isa_irq(int irq, int active)
static inline void pcibios_penalize_isa_irq(int irq, int active)
{
/* We don't do dynamic PCI IRQ allocation */
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/asm-h8300/tlbflush.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ static inline void flush_tlb_range(struct mm_struct *mm,
BUG();
}

extern inline void flush_tlb_kernel_page(unsigned long addr)
static inline void flush_tlb_kernel_page(unsigned long addr)
{
BUG();
}

extern inline void flush_tlb_pgtables(struct mm_struct *mm,
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
{
BUG();
Expand Down

0 comments on commit 25f09dd

Please sign in to comment.