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

Commit 934752d8 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Benjamin Herrenschmidt
Browse files

hvc_console: Remove __devexit annotation of hvc_remove() 



Removed __devexit annotation of hvc_remove() to avoid a section mismatch
if the backend initialization fails and hvc_remove() must be used to
clean up allocated hvc structs (called in section __init or __devinit).

Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent febde371

drivers/char/hvc_console.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, 
}

EXPORT_SYMBOL_GPL(hvc_alloc);



int __devexit hvc_remove(struct hvc_struct *hp)

int hvc_remove(struct hvc_struct *hp)

{

	unsigned long flags;

	struct tty_struct *tty;

drivers/char/hvc_console.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops); 
extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,

				struct hv_ops *ops, int outbuf_size);

/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */

extern int __devexit hvc_remove(struct hvc_struct *hp);

extern int hvc_remove(struct hvc_struct *hp);



/* data available */

int hvc_poll(struct hvc_struct *hp);