summaryrefslogtreecommitdiff
path: root/samples/markers/marker-example.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 05:43:52 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-11 05:43:52 +0300
commit99cd7074891f87c49660e3b2880564324a4733ac (patch)
tree903d2665bcb445f1f265d1adf7a99f265bcefc15 /samples/markers/marker-example.c
parente8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'samples/markers/marker-example.c')
-rw-r--r--samples/markers/marker-example.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/markers/marker-example.c b/samples/markers/marker-example.c
index e90dc5d04392..e9cd9c0bc84f 100644
--- a/samples/markers/marker-example.c
+++ b/samples/markers/marker-example.c
@@ -30,7 +30,7 @@ static struct file_operations mark_ops = {
.open = my_open,
};
-static int example_init(void)
+static int __init example_init(void)
{
printk(KERN_ALERT "example init\n");
pentry_example = proc_create("marker-example", 0444, NULL, &mark_ops);
@@ -39,7 +39,7 @@ static int example_init(void)
return 0;
}
-static void example_exit(void)
+static void __exit example_exit(void)
{
printk(KERN_ALERT "example exit\n");
remove_proc_entry("marker-example", NULL);