diff options
-rwxr-xr-x | src/hal/os/linux/kernel/gc_hal_kernel_linux.h | 7 | ||||
-rwxr-xr-x | src/hal/os/linux/kernel/gc_hal_kernel_os.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_linux.h b/src/hal/os/linux/kernel/gc_hal_kernel_linux.h index d8b23fe..ae06be6 100755 --- a/src/hal/os/linux/kernel/gc_hal_kernel_linux.h +++ b/src/hal/os/linux/kernel/gc_hal_kernel_linux.h | |||
@@ -62,6 +62,10 @@ | |||
62 | #include <linux/fs.h> | 62 | #include <linux/fs.h> |
63 | #include <linux/mm.h> | 63 | #include <linux/mm.h> |
64 | #include <linux/sched.h> | 64 | #include <linux/sched.h> |
65 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) | ||
66 | #include <linux/sched/signal.h> | ||
67 | #include <linux/nmi.h> | ||
68 | #endif | ||
65 | #include <linux/signal.h> | 69 | #include <linux/signal.h> |
66 | #ifdef FLAREON | 70 | #ifdef FLAREON |
67 | # include <asm/arch-realview/dove_gpio_irq.h> | 71 | # include <asm/arch-realview/dove_gpio_irq.h> |
@@ -76,6 +80,9 @@ | |||
76 | #ifdef MODVERSIONS | 80 | #ifdef MODVERSIONS |
77 | # include <linux/modversions.h> | 81 | # include <linux/modversions.h> |
78 | #endif | 82 | #endif |
83 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) | ||
84 | #include <linux/uaccess.h> | ||
85 | #endif | ||
79 | #include <asm/io.h> | 86 | #include <asm/io.h> |
80 | #include <asm/uaccess.h> | 87 | #include <asm/uaccess.h> |
81 | 88 | ||
diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_os.c b/src/hal/os/linux/kernel/gc_hal_kernel_os.c index f8ec4ab..4519904 100755 --- a/src/hal/os/linux/kernel/gc_hal_kernel_os.c +++ b/src/hal/os/linux/kernel/gc_hal_kernel_os.c | |||
@@ -7039,7 +7039,11 @@ gckOS_WaitSignal( | |||
7039 | #else | 7039 | #else |
7040 | DECLARE_WAITQUEUE(wait, current); | 7040 | DECLARE_WAITQUEUE(wait, current); |
7041 | wait.flags |= WQ_FLAG_EXCLUSIVE; | 7041 | wait.flags |= WQ_FLAG_EXCLUSIVE; |
7042 | __add_wait_queue_tail(&signal->obj.wait, &wait); | 7042 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0) |
7043 | __add_wait_queue_entry_tail(&signal->obj.wait, &wait); | ||
7044 | #else | ||
7045 | __add_wait_queue_tail(&signal->obj.wait, &wait); | ||
7046 | #endif | ||
7043 | #endif | 7047 | #endif |
7044 | 7048 | ||
7045 | while (gcvTRUE) | 7049 | while (gcvTRUE) |