Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123367
b: refs/heads/master
c: efeac2f
h: refs/heads/master
i:
  123365: a7b186b
  123363: 17931ab
  123359: 786d32c
v: v3
  • Loading branch information
David S. Miller committed Dec 6, 2008
1 parent a0f42d1 commit e6ed837
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 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: dfa76060be85dd48d3803bc26f6a6d2e93e812f0
refs/heads/master: efeac2f87609ab25dab329ce16876eb9110b2084
2 changes: 2 additions & 0 deletions trunk/arch/sparc/kernel/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
extern struct device_node *allnodes; /* temporary while merging */
extern rwlock_t devtree_lock; /* temporary while merging */

extern void * prom_early_alloc(unsigned long size);

#endif /* __PROM_H */
2 changes: 1 addition & 1 deletion trunk/arch/sparc/kernel/prom_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

static unsigned int prom_early_allocated;

static void * __init prom_early_alloc(unsigned long size)
void * __init prom_early_alloc(unsigned long size)
{
void *ret;

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sparc/kernel/prom_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

static unsigned int prom_early_allocated __initdata;

static void * __init prom_early_alloc(unsigned long size)
void * __init prom_early_alloc(unsigned long size)
{
unsigned long paddr = lmb_alloc(size, SMP_CACHE_BYTES);
void *ret;
Expand Down

0 comments on commit e6ed837

Please sign in to comment.