projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Change rheap functions to use ulongs instead of pointers
[powerpc.git]
/
arch
/
ppc
/
syslib
/
cpm2_common.c
diff --git
a/arch/ppc/syslib/cpm2_common.c
b/arch/ppc/syslib/cpm2_common.c
index
4c19a4a
..
6cd859d
100644
(file)
--- a/
arch/ppc/syslib/cpm2_common.c
+++ b/
arch/ppc/syslib/cpm2_common.c
@@
-27,7
+27,6
@@
#include <asm/mpc8260.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/mpc8260.h>
#include <asm/page.h>
#include <asm/pgtable.h>
-#include <asm/immap_cpm2.h>
#include <asm/cpm2.h>
#include <asm/rheap.h>
#include <asm/cpm2.h>
#include <asm/rheap.h>
@@
-137,15
+136,14
@@
static void cpm2_dpinit(void)
* varies with the processor and the microcode patches activated.
* But the following should be at least safe.
*/
* varies with the processor and the microcode patches activated.
* But the following should be at least safe.
*/
- rh_attach_region(&cpm_dpmem_info, (void *)CPM_DATAONLY_BASE,
- CPM_DATAONLY_SIZE);
+ rh_attach_region(&cpm_dpmem_info, CPM_DATAONLY_BASE, CPM_DATAONLY_SIZE);
}
/* This function returns an index into the DPRAM area.
*/
}
/* This function returns an index into the DPRAM area.
*/
-u
int
cpm_dpalloc(uint size, uint align)
+u
nsigned long
cpm_dpalloc(uint size, uint align)
{
{
-
void *
start;
+
unsigned long
start;
unsigned long flags;
spin_lock_irqsave(&cpm_dpmem_lock, flags);
unsigned long flags;
spin_lock_irqsave(&cpm_dpmem_lock, flags);
@@
-153,17
+151,17
@@
uint cpm_dpalloc(uint size, uint align)
start = rh_alloc(&cpm_dpmem_info, size, "commproc");
spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
start = rh_alloc(&cpm_dpmem_info, size, "commproc");
spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
- return
(uint)
start;
+ return start;
}
EXPORT_SYMBOL(cpm_dpalloc);
}
EXPORT_SYMBOL(cpm_dpalloc);
-int cpm_dpfree(u
int
offset)
+int cpm_dpfree(u
nsigned long
offset)
{
int ret;
unsigned long flags;
spin_lock_irqsave(&cpm_dpmem_lock, flags);
{
int ret;
unsigned long flags;
spin_lock_irqsave(&cpm_dpmem_lock, flags);
- ret = rh_free(&cpm_dpmem_info,
(void *)
offset);
+ ret = rh_free(&cpm_dpmem_info, offset);
spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
return ret;
spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
return ret;
@@
-171,17
+169,17
@@
int cpm_dpfree(uint offset)
EXPORT_SYMBOL(cpm_dpfree);
/* not sure if this is ever needed */
EXPORT_SYMBOL(cpm_dpfree);
/* not sure if this is ever needed */
-u
int cpm_dpalloc_fixed(uint
offset, uint size, uint align)
+u
nsigned long cpm_dpalloc_fixed(unsigned long
offset, uint size, uint align)
{
{
-
void *
start;
+
unsigned long
start;
unsigned long flags;
spin_lock_irqsave(&cpm_dpmem_lock, flags);
cpm_dpmem_info.alignment = align;
unsigned long flags;
spin_lock_irqsave(&cpm_dpmem_lock, flags);
cpm_dpmem_info.alignment = align;
- start = rh_alloc_fixed(&cpm_dpmem_info,
(void *)
offset, size, "commproc");
+ start = rh_alloc_fixed(&cpm_dpmem_info, offset, size, "commproc");
spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
- return
(uint)
start;
+ return start;
}
EXPORT_SYMBOL(cpm_dpalloc_fixed);
}
EXPORT_SYMBOL(cpm_dpalloc_fixed);
@@
-191,7
+189,7
@@
void cpm_dpdump(void)
}
EXPORT_SYMBOL(cpm_dpdump);
}
EXPORT_SYMBOL(cpm_dpdump);
-void *cpm_dpram_addr(u
int
offset)
+void *cpm_dpram_addr(u
nsigned long
offset)
{
return (void *)&cpm2_immr->im_dprambase[offset];
}
{
return (void *)&cpm2_immr->im_dprambase[offset];
}