Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7079060f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

parents 3f00d3e8 0a1cc0b6

drivers/char/agp/ali-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ static struct pci_device_id agp_ali_pci_table[] = { 
MODULE_DEVICE_TABLE(pci, agp_ali_pci_table);



static struct pci_driver agp_ali_pci_driver = {

	.owner		= THIS_MODULE,

	.name		= "agpgart-ali",

	.id_table	= agp_ali_pci_table,

	.probe		= agp_ali_probe,

drivers/char/agp/amd-k7-agp.c

+3 −5
Original line number Diff line number Diff line
@@ -94,19 +94,16 @@ static int amd_create_gatt_pages(int nr_tables) 
	int retval = 0;

	int i;



	tables = kmalloc((nr_tables + 1) * sizeof(struct amd_page_map *),

			 GFP_KERNEL);

	tables = kzalloc((nr_tables + 1) * sizeof(struct amd_page_map *),GFP_KERNEL);

	if (tables == NULL)

		return -ENOMEM;



	memset (tables, 0, sizeof(struct amd_page_map *) * (nr_tables + 1));

	for (i = 0; i < nr_tables; i++) {

		entry = kmalloc(sizeof(struct amd_page_map), GFP_KERNEL);

		entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL);

		if (entry == NULL) {

			retval = -ENOMEM;

			break;

		}

		memset (entry, 0, sizeof(struct amd_page_map));

		tables[i] = entry;

		retval = amd_create_page_map(entry);

		if (retval != 0)
@@ -518,6 +515,7 @@ static struct pci_device_id agp_amdk7_pci_table[] = { 
MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table);



static struct pci_driver agp_amdk7_pci_driver = {

	.owner		= THIS_MODULE,

	.name		= "agpgart-amdk7",

	.id_table	= agp_amdk7_pci_table,

	.probe		= agp_amdk7_probe,

drivers/char/agp/amd64-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ static struct pci_device_id agp_amd64_pci_table[] = { 
MODULE_DEVICE_TABLE(pci, agp_amd64_pci_table);



static struct pci_driver agp_amd64_pci_driver = {

	.owner		= THIS_MODULE,

	.name		= "agpgart-amd64",

	.id_table	= agp_amd64_pci_table,

	.probe		= agp_amd64_probe,

drivers/char/agp/ati-agp.c

+3 −5
Original line number Diff line number Diff line
@@ -118,14 +118,12 @@ static int ati_create_gatt_pages(int nr_tables) 
	int retval = 0;

	int i;



	tables = kmalloc((nr_tables + 1) * sizeof(ati_page_map *),

			 GFP_KERNEL);

	tables = kzalloc((nr_tables + 1) * sizeof(ati_page_map *),GFP_KERNEL);

	if (tables == NULL)

		return -ENOMEM;



	memset(tables, 0, sizeof(ati_page_map *) * (nr_tables + 1));

	for (i = 0; i < nr_tables; i++) {

		entry = kmalloc(sizeof(ati_page_map), GFP_KERNEL);

		entry = kzalloc(sizeof(ati_page_map), GFP_KERNEL);

		if (entry == NULL) {

			while (i>0) {

				kfree (tables[i-1]);
@@ -136,7 +134,6 @@ static int ati_create_gatt_pages(int nr_tables) 
			retval = -ENOMEM;

			break;

		}

		memset(entry, 0, sizeof(ati_page_map));

		tables[i] = entry;

		retval = ati_create_page_map(entry);

		if (retval != 0) break;
@@ -524,6 +521,7 @@ static struct pci_device_id agp_ati_pci_table[] = { 
MODULE_DEVICE_TABLE(pci, agp_ati_pci_table);



static struct pci_driver agp_ati_pci_driver = {

	.owner		= THIS_MODULE,

	.name		= "agpgart-ati",

	.id_table	= agp_ati_pci_table,

	.probe		= agp_ati_probe,

drivers/char/agp/backend.c

+3 −3
Original line number Diff line number Diff line
@@ -222,12 +222,12 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) 


struct agp_bridge_data *agp_alloc_bridge(void)

{

	struct agp_bridge_data *bridge = kmalloc(sizeof(*bridge), GFP_KERNEL);

	struct agp_bridge_data *bridge;

	

	bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);

	if (!bridge)

		return NULL;



	memset(bridge, 0, sizeof(*bridge));

	atomic_set(&bridge->agp_in_use, 0);

	atomic_set(&bridge->current_memory_agp, 0);