chengshan / rpms / kernel

Forked from rpms/kernel 2 years ago
Clone
e293be
diff -up ./arch/x86/events/intel/ds.c.kam ./arch/x86/events/intel/ds.c
e293be
--- ./arch/x86/events/intel/ds.c.kam	2018-10-05 05:18:19.000000000 +0900
e293be
+++ ./arch/x86/events/intel/ds.c	2018-11-02 11:12:18.000000000 +0900
e293be
@@ -292,7 +292,7 @@ static void *dsalloc(size_t size, gfp_t
e293be
 	if (!page)
e293be
 		return NULL;
e293be
 	addr = (unsigned long)page_address(page);
e293be
-	if (kaiser_add_mapping(addr, size, __PAGE_KERNEL | _PAGE_GLOBAL) < 0) {
e293be
+	if (kaiser_add_mapping(addr, size, (unsigned long)(__PAGE_KERNEL | _PAGE_GLOBAL)) < 0) {
e293be
 		__free_pages(page, order);
e293be
 		addr = 0;
e293be
 	}
e293be
diff -up ./arch/x86/kernel/ldt.c.kam ./arch/x86/kernel/ldt.c
e293be
--- ./arch/x86/kernel/ldt.c.kam	2018-10-05 05:18:19.000000000 +0900
e293be
+++ ./arch/x86/kernel/ldt.c	2018-11-02 11:19:58.000000000 +0900
e293be
@@ -94,7 +94,7 @@ static struct ldt_struct *alloc_ldt_stru
e293be
 
e293be
 	ret = kaiser_add_mapping((unsigned long)new_ldt->entries,
e293be
 				alloc_size,
e293be
-				__PAGE_KERNEL | _PAGE_GLOBAL);
e293be
+				(unsigned long)(__PAGE_KERNEL | _PAGE_GLOBAL));
e293be
 	if (ret) {
e293be
 		free_ldt(new_ldt, size);
e293be
 		return NULL;