From 54453a63920b65e79555913b1074a542ff1c8726 Mon Sep 17 00:00:00 2001
From: Armin Luntzer <armin.luntzer@univie.ac.at>
Date: Wed, 23 Sep 2020 11:31:44 +0200
Subject: [PATCH] rename demo.c to avoid merge conflict and keep actual
proc_net demonstrator
---
init/{demo.c => proc_net_demo.c} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename init/{demo.c => proc_net_demo.c} (93%)
diff --git a/init/demo.c b/init/proc_net_demo.c
similarity index 93%
rename from init/demo.c
rename to init/proc_net_demo.c
index 43649b5..7eeef89 100644
--- a/init/demo.c
+++ b/init/proc_net_demo.c
@@ -208,11 +208,11 @@ void pn_new_input_task(struct proc_net *pn, size_t n)
}
-int demo(void *p __attribute__((unused)))
+int proc_net_demo(void *p __attribute__((unused)))
{
struct proc_net *pn;
- printk("DEMO STARTING\n");
+ printk("PROC_NET DEMO STARTING\n");
pn = pn_create();
@@ -232,17 +232,17 @@ int demo(void *p __attribute__((unused)))
pn_process_outputs(pn);
- printk("DEMO COMPLETE\n");
+ printk("PROC_NET DEMO COMPLETE\n");
return 0;
}
-void demo_start(void)
+void proc_net_demo_start(void)
{
struct task_struct *t;
- t = kthread_create(demo, NULL, KTHREAD_CPU_AFFINITY_NONE, "DEMO");
+ t = kthread_create(demo, NULL, KTHREAD_CPU_AFFINITY_NONE, "PROC_NET_DEMO");
/* allocate 98% of the cpu */
kthread_set_sched_edf(t, 100*1000, 99*1000, 98*1000);
--
GitLab