git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 6071/1: perf-events: allow modules to query the number of hardware counters
[safe/jmp/linux-2.6]
/
arch
/
m68k
/
sun3
/
sun3dvma.c
diff --git
a/arch/m68k/sun3/sun3dvma.c
b/arch/m68k/sun3/sun3dvma.c
index
f04a1d2
..
f9277e8
100644
(file)
--- a/
arch/m68k/sun3/sun3dvma.c
+++ b/
arch/m68k/sun3/sun3dvma.c
@@
-1,12
+1,12
@@
/*
/*
- * linux/arch/m68k/
mm
/sun3dvma.c
+ * linux/arch/m68k/
sun3
/sun3dvma.c
*
* Copyright (C) 2000 Sam Creasey
*
* Contains common routines for sun3/sun3x DVMA management.
*/
*
* Copyright (C) 2000 Sam Creasey
*
* Contains common routines for sun3/sun3x DVMA management.
*/
-#include <linux/
config
.h>
+#include <linux/
module
.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/list.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/list.h>
@@
-29,7
+29,7
@@
static inline void dvma_unmap_iommu(unsigned long a, int b)
extern void sun3_dvma_init(void);
#endif
extern void sun3_dvma_init(void);
#endif
-unsigned long iommu_use[IOMMU_TOTAL_ENTRIES];
+
static
unsigned long iommu_use[IOMMU_TOTAL_ENTRIES];
#define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT)
#define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT)
@@
-119,8
+119,7
@@
static inline int refill(void)
if(hole->end == prev->start) {
hole->size += prev->size;
hole->end = prev->end;
if(hole->end == prev->start) {
hole->size += prev->size;
hole->end = prev->end;
- list_del(&(prev->list));
- list_add(&(prev->list), &hole_cache);
+ list_move(&(prev->list), &hole_cache);
ret++;
}
ret++;
}
@@
-182,8
+181,7
@@
static inline unsigned long get_baddr(int len, unsigned long align)
#endif
return hole->end;
} else if(hole->size == newlen) {
#endif
return hole->end;
} else if(hole->size == newlen) {
- list_del(&(hole->list));
- list_add(&(hole->list), &hole_cache);
+ list_move(&(hole->list), &hole_cache);
dvma_entry_use(hole->start) = newlen;
#ifdef DVMA_DEBUG
dvma_allocs++;
dvma_entry_use(hole->start) = newlen;
#ifdef DVMA_DEBUG
dvma_allocs++;
@@
-315,6
+313,7
@@
inline unsigned long dvma_map_align(unsigned long kaddr, int len, int align)
BUG();
return 0;
}
BUG();
return 0;
}
+EXPORT_SYMBOL(dvma_map_align);
void dvma_unmap(void *baddr)
{
void dvma_unmap(void *baddr)
{
@@
-330,7
+329,7
@@
void dvma_unmap(void *baddr)
return;
}
return;
}
-
+EXPORT_SYMBOL(dvma_unmap);
void *dvma_malloc_align(unsigned long len, unsigned long align)
{
void *dvma_malloc_align(unsigned long len, unsigned long align)
{
@@
-370,6
+369,7
@@
void *dvma_malloc_align(unsigned long len, unsigned long align)
return (void *)vaddr;
}
return (void *)vaddr;
}
+EXPORT_SYMBOL(dvma_malloc_align);
void dvma_free(void *vaddr)
{
void dvma_free(void *vaddr)
{
@@
-377,3
+377,4
@@
void dvma_free(void *vaddr)
return;
}
return;
}
+EXPORT_SYMBOL(dvma_free);