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
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
char
/
agp
/
efficeon-agp.c
diff --git
a/drivers/char/agp/efficeon-agp.c
b/drivers/char/agp/efficeon-agp.c
index
3346da4
..
ac19fdc
100644
(file)
--- a/
drivers/char/agp/efficeon-agp.c
+++ b/
drivers/char/agp/efficeon-agp.c
@@
-148,7
+148,7
@@
static int efficeon_configure(void)
return 0;
}
return 0;
}
-static int efficeon_free_gatt_table(
void
)
+static int efficeon_free_gatt_table(
struct agp_bridge_data *bridge
)
{
int index, freed = 0;
{
int index, freed = 0;
@@
-183,7
+183,7
@@
static int efficeon_free_gatt_table(void)
#define GET_GATT(addr) (efficeon_private.gatt_pages[\
GET_PAGE_DIR_IDX(addr)]->remapped)
#define GET_GATT(addr) (efficeon_private.gatt_pages[\
GET_PAGE_DIR_IDX(addr)]->remapped)
-static int efficeon_create_gatt_table(
void
)
+static int efficeon_create_gatt_table(
struct agp_bridge_data *bridge
)
{
int index;
const int pati = EFFICEON_PATI;
{
int index;
const int pati = EFFICEON_PATI;
@@
-209,7
+209,7
@@
static int efficeon_create_gatt_table(void)
page = get_zeroed_page(GFP_KERNEL);
if (!page) {
page = get_zeroed_page(GFP_KERNEL);
if (!page) {
- efficeon_free_gatt_table();
+ efficeon_free_gatt_table(
agp_bridge
);
return -ENOMEM;
}
SetPageReserved(virt_to_page((char *)page));
return -ENOMEM;
}
SetPageReserved(virt_to_page((char *)page));
@@
-219,7
+219,7
@@
static int efficeon_create_gatt_table(void)
efficeon_private.l1_table[index] = page;
efficeon_private.l1_table[index] = page;
- value =
__pa
(page) | pati | present | index;
+ value =
virt_to_gart
(page) | pati | present | index;
pci_write_config_dword(agp_bridge->dev,
EFFICEON_ATTPAGE, value);
pci_write_config_dword(agp_bridge->dev,
EFFICEON_ATTPAGE, value);
@@
-303,7
+303,7
@@
static int efficeon_remove_memory(struct agp_memory * mem, off_t pg_start, int t
}
}
-struct agp_bridge_driver efficeon_driver = {
+st
atic st
ruct agp_bridge_driver efficeon_driver = {
.owner = THIS_MODULE,
.aperture_sizes = efficeon_generic_sizes,
.size_type = LVL2_APER_SIZE,
.owner = THIS_MODULE,
.aperture_sizes = efficeon_generic_sizes,
.size_type = LVL2_APER_SIZE,
@@
-408,7
+408,7
@@
static void __devexit agp_efficeon_remove(struct pci_dev *pdev)
agp_put_bridge(bridge);
}
agp_put_bridge(bridge);
}
-static int agp_efficeon_suspend(struct pci_dev *dev,
u32
state)
+static int agp_efficeon_suspend(struct pci_dev *dev,
pm_message_t
state)
{
return 0;
}
{
return 0;
}
@@
-448,7
+448,7
@@
static int __init agp_efficeon_init(void)
return 0;
agp_initialised=1;
return 0;
agp_initialised=1;
- return pci_
module_init
(&agp_efficeon_pci_driver);
+ return pci_
register_driver
(&agp_efficeon_pci_driver);
}
static void __exit agp_efficeon_cleanup(void)
}
static void __exit agp_efficeon_cleanup(void)