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

Commit d817cd52 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

virtio: fix section mismatch warnings 



Fix fixes the following warnings by renaming the driver structures to be
suffixed with _driver.

WARNING: drivers/virtio/virtio_balloon.o(.data+0x88): Section mismatch in reference from the variable virtio_balloon to the function .devexit.text:virtballoon_remove()

WARNING: drivers/char/hw_random/virtio-rng.o(.data+0x88): Section mismatch in reference from the variable virtio_rng to the function .devexit.text:virtrng_remove()

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de3fab39

drivers/char/hw_random/virtio-rng.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ static struct virtio_device_id id_table[] = { 
	{ 0 },

	{ 0 },

};

};





static struct virtio_driver virtio_rng = {

static struct virtio_driver virtio_rng_driver = {

	.driver.name =	KBUILD_MODNAME,

	.driver.name =	KBUILD_MODNAME,

	.driver.owner =	THIS_MODULE,

	.driver.owner =	THIS_MODULE,

	.id_table =	id_table,

	.id_table =	id_table,
@@ -124,12 +124,12 @@ static struct virtio_driver virtio_rng = { 




static int __init init(void)

static int __init init(void)

{

{

	return register_virtio_driver(&virtio_rng);

	return register_virtio_driver(&virtio_rng_driver);

}

}





static void __exit fini(void)

static void __exit fini(void)

{

{

	unregister_virtio_driver(&virtio_rng);

	unregister_virtio_driver(&virtio_rng_driver);

}

}

module_init(init);

module_init(init);

module_exit(fini);

module_exit(fini);

drivers/virtio/virtio_balloon.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -266,7 +266,7 @@ static void __devexit virtballoon_remove(struct virtio_device *vdev) 




static unsigned int features[] = { VIRTIO_BALLOON_F_MUST_TELL_HOST };

static unsigned int features[] = { VIRTIO_BALLOON_F_MUST_TELL_HOST };





static struct virtio_driver virtio_balloon = {

static struct virtio_driver virtio_balloon_driver = {

	.feature_table = features,

	.feature_table = features,

	.feature_table_size = ARRAY_SIZE(features),

	.feature_table_size = ARRAY_SIZE(features),

	.driver.name =	KBUILD_MODNAME,

	.driver.name =	KBUILD_MODNAME,
@@ -279,12 +279,12 @@ static struct virtio_driver virtio_balloon = { 




static int __init init(void)

static int __init init(void)

{

{

	return register_virtio_driver(&virtio_balloon);

	return register_virtio_driver(&virtio_balloon_driver);

}

}





static void __exit fini(void)

static void __exit fini(void)

{

{

	unregister_virtio_driver(&virtio_balloon);

	unregister_virtio_driver(&virtio_balloon_driver);

}

}

module_init(init);

module_init(init);

module_exit(fini);

module_exit(fini);