git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
v850
/
kernel
/
rte_mb_a_pci.c
diff --git
a/arch/v850/kernel/rte_mb_a_pci.c
b/arch/v850/kernel/rte_mb_a_pci.c
index
f36b778
..
88e5c93
100644
(file)
--- a/
arch/v850/kernel/rte_mb_a_pci.c
+++ b/
arch/v850/kernel/rte_mb_a_pci.c
@@
-11,6
+11,7
@@
* Written by Miles Bader <miles@gnu.org>
*/
* Written by Miles Bader <miles@gnu.org>
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-328,7
+329,7
@@
void pcibios_fixup_bus(struct pci_bus *b)
void
pcibios_align_resource (void *data, struct resource *res,
void
pcibios_align_resource (void *data, struct resource *res,
-
resource_size_t size, resource_size_t
align)
+
unsigned long size, unsigned long
align)
{
}
{
}
@@
-365,7
+366,7
@@
static DEFINE_SPINLOCK(mb_sram_lock);
static void *alloc_mb_sram (size_t size)
{
struct mb_sram_free_area *prev, *fa;
static void *alloc_mb_sram (size_t size)
{
struct mb_sram_free_area *prev, *fa;
-
int
flags;
+
unsigned long
flags;
void *mem = 0;
spin_lock_irqsave (mb_sram_lock, flags);
void *mem = 0;
spin_lock_irqsave (mb_sram_lock, flags);
@@
-406,7
+407,7
@@
static void *alloc_mb_sram (size_t size)
static void free_mb_sram (void *mem, size_t size)
{
struct mb_sram_free_area *prev, *fa, *new_fa;
static void free_mb_sram (void *mem, size_t size)
{
struct mb_sram_free_area *prev, *fa, *new_fa;
-
int
flags;
+
unsigned long
flags;
void *end = mem + size;
spin_lock_irqsave (mb_sram_lock, flags);
void *end = mem + size;
spin_lock_irqsave (mb_sram_lock, flags);
@@
-517,7
+518,7
@@
static DEFINE_SPINLOCK(dma_mappings_lock);
static struct dma_mapping *new_dma_mapping (size_t size)
{
static struct dma_mapping *new_dma_mapping (size_t size)
{
-
int
flags;
+
unsigned long
flags;
struct dma_mapping *mapping;
void *mb_sram_block = alloc_mb_sram (size);
struct dma_mapping *mapping;
void *mb_sram_block = alloc_mb_sram (size);
@@
-575,7
+576,7
@@
static struct dma_mapping *new_dma_mapping (size_t size)
static struct dma_mapping *find_dma_mapping (void *mb_sram_addr)
{
static struct dma_mapping *find_dma_mapping (void *mb_sram_addr)
{
-
int
flags;
+
unsigned long
flags;
struct dma_mapping *mapping;
spin_lock_irqsave (dma_mappings_lock, flags);
struct dma_mapping *mapping;
spin_lock_irqsave (dma_mappings_lock, flags);
@@
-592,7
+593,7
@@
static struct dma_mapping *find_dma_mapping (void *mb_sram_addr)
static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr)
{
static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr)
{
-
int
flags;
+
unsigned long
flags;
struct dma_mapping *mapping, *prev;
spin_lock_irqsave (dma_mappings_lock, flags);
struct dma_mapping *mapping, *prev;
spin_lock_irqsave (dma_mappings_lock, flags);
@@
-622,7
+623,7
@@
static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr)
static inline void
free_dma_mapping (struct dma_mapping *mapping)
{
static inline void
free_dma_mapping (struct dma_mapping *mapping)
{
-
int
flags;
+
unsigned long
flags;
free_mb_sram (mapping->mb_sram_addr, mapping->size);
free_mb_sram (mapping->mb_sram_addr, mapping->size);