aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/shared/common-offsets.h4
-rw-r--r--arch/um/os-Linux/time.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h
index 2df313b6a586..c92306809029 100644
--- a/arch/um/include/shared/common-offsets.h
+++ b/arch/um/include/shared/common-offsets.h
@@ -30,8 +30,8 @@ DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);
30#ifdef CONFIG_PRINTK 30#ifdef CONFIG_PRINTK
31DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK); 31DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK);
32#endif 32#endif
33#ifdef CONFIG_NO_HZ 33#ifdef CONFIG_NO_HZ_COMMON
34DEFINE(UML_CONFIG_NO_HZ, CONFIG_NO_HZ); 34DEFINE(UML_CONFIG_NO_HZ_COMMON, CONFIG_NO_HZ_COMMON);
35#endif 35#endif
36#ifdef CONFIG_UML_X86 36#ifdef CONFIG_UML_X86
37DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86); 37DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86);
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index fac388cb464f..e9824d5dd7d5 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -79,7 +79,7 @@ long long os_nsecs(void)
79 return timeval_to_ns(&tv); 79 return timeval_to_ns(&tv);
80} 80}
81 81
82#ifdef UML_CONFIG_NO_HZ 82#ifdef UML_CONFIG_NO_HZ_COMMON
83static int after_sleep_interval(struct timespec *ts) 83static int after_sleep_interval(struct timespec *ts)
84{ 84{
85 return 0; 85 return 0;