projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 28c4ae14 JB |
1 | --- linux-3.10/drivers/input/misc/wistron_btns.c.orig 2013-11-16 09:05:55.612742472 +0100 |
| 2 | +++ linux-3.10/drivers/input/misc/wistron_btns.c 2013-11-16 09:24:37.356028732 +0100 | |
| 3 | @@ -33,6 +33,7 @@ | |
| 4 | #include <linux/types.h> | |
| 5 | #include <linux/platform_device.h> | |
| 6 | #include <linux/leds.h> | |
| 22fa206a | 7 | +#include <linux/set_memory.h> |
| 28c4ae14 JB |
8 | |
| 9 | /* How often we poll keys - msecs */ | |
| 10 | #define POLL_INTERVAL_DEFAULT 500 /* when idle */ | |
| 11 | @@ -124,6 +125,7 @@ | |
| 12 | if (entry_point >= 0xF0000) { | |
| 13 | bios_code_map_base = base; | |
| 14 | bios_entry_point = bios_code_map_base + (entry_point & 0xFFFF); | |
| 15 | + set_memory_x((unsigned long)bios_code_map_base, 0x10000 >> PAGE_SHIFT); | |
| 16 | } else { | |
| 17 | iounmap(base); | |
| 18 | bios_code_map_base = ioremap(entry_point & ~0x3FFF, 0x4000); | |
| 19 | @@ -134,6 +136,7 @@ | |
| 20 | goto err; | |
| 21 | } | |
| 22 | bios_entry_point = bios_code_map_base + (entry_point & 0x3FFF); | |
| 23 | + set_memory_x((unsigned long)bios_code_map_base, 0x4000 >> PAGE_SHIFT); | |
| 24 | } | |
| 25 | /* The Windows driver maps 0x10000 bytes, we keep only one page... */ | |
| 26 | bios_data_map_base = ioremap(0x400, 0xc00); | |
| 394e211a AM |
27 | --- linux-5.4/arch/x86/mm/pat/set_memory.c~ 2019-11-25 01:32:01.000000000 +0100 |
| 28 | +++ linux-5.4/arch/x86/mm/pat/set_memory.c 2019-11-27 06:38:21.886578313 +0100 | |
| 93ea2735 AM |
29 | @@ -1885,6 +1885,7 @@ int set_memory_x(unsigned long addr, int |
| 30 | ||
| 31 | return change_page_attr_clear(&addr, numpages, __pgprot(_PAGE_NX), 0); | |
| 32 | } | |
| 33 | +EXPORT_SYMBOL(set_memory_x); | |
| 34 | ||
| 35 | int set_memory_nx(unsigned long addr, int numpages) | |
| 36 | { |