Kernel v3.6

xming

Hi,

0.1.2 applies to kernel 3.6 with just one easy to fix conflict. Going to compile and test later, will report back.

xming

it doens't compile :/

1.   CC      mm/uksm.o
   
2. /usr/src/linux.git/mm/uksm.c: In function 'page_hash':
   
3. /usr/src/linux.git/mm/uksm.c:1334:33: error: 'KM_USER0' undeclared (first use in this function)
   
4. /usr/src/linux.git/mm/uksm.c:1334:33: note: each undeclared identifier is reported only once for each function it appears in
   
5. /usr/src/linux.git/mm/uksm.c:1334:2: error: too many arguments to function 'kmap_atomic'
   
6. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
   
7.                  from /usr/src/linux.git/mm/uksm.c:51:
   
8. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
   
9. /usr/src/linux.git/mm/uksm.c:1337:30: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
   
10. /usr/src/linux.git/mm/uksm.c:1337:2: error: 'kunmap_atomic' undeclared (first use in this function)
    
11. /usr/src/linux.git/mm/uksm.c: In function 'memcmp_pages':
    
12. /usr/src/linux.git/mm/uksm.c:1357:29: error: 'KM_USER0' undeclared (first use in this function)
    
13. /usr/src/linux.git/mm/uksm.c:1357:2: error: too many arguments to function 'kmap_atomic'
    
14. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
15.                  from /usr/src/linux.git/mm/uksm.c:51:
    
16. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
17. /usr/src/linux.git/mm/uksm.c:1358:29: error: 'KM_USER1' undeclared (first use in this function)
    
18. /usr/src/linux.git/mm/uksm.c:1358:2: error: too many arguments to function 'kmap_atomic'
    
19. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
20.                  from /usr/src/linux.git/mm/uksm.c:51:
    
21. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
22. /usr/src/linux.git/mm/uksm.c:1360:31: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
23. /usr/src/linux.git/mm/uksm.c:1360:2: error: 'kunmap_atomic' undeclared (first use in this function)
    
24. /usr/src/linux.git/mm/uksm.c:1361:31: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
25. /usr/src/linux.git/mm/uksm.c: In function 'is_page_full_zero':
    
26. /usr/src/linux.git/mm/uksm.c:1379:27: error: 'KM_USER0' undeclared (first use in this function)
    
27. /usr/src/linux.git/mm/uksm.c:1379:2: error: too many arguments to function 'kmap_atomic'
    
28. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
29.                  from /usr/src/linux.git/mm/uksm.c:51:
    
30. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
31. /usr/src/linux.git/mm/uksm.c:1381:30: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
32. /usr/src/linux.git/mm/uksm.c:1381:2: error: 'kunmap_atomic' undeclared (first use in this function)
    
33. /usr/src/linux.git/mm/uksm.c: In function 'page_hash_max':
    
34. /usr/src/linux.git/mm/uksm.c:1539:27: error: 'KM_USER0' undeclared (first use in this function)
    
35. /usr/src/linux.git/mm/uksm.c:1539:2: error: too many arguments to function 'kmap_atomic'
    
36. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
37.                  from /usr/src/linux.git/mm/uksm.c:51:
    
38. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
39. /usr/src/linux.git/mm/uksm.c:1543:30: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
40. /usr/src/linux.git/mm/uksm.c:1543:2: error: 'kunmap_atomic' undeclared (first use in this function)
    
41. /usr/src/linux.git/mm/uksm.c: In function 'stable_tree_delta_hash':
    
42. /usr/src/linux.git/mm/uksm.c:3740:34: error: 'KM_USER0' undeclared (first use in this function)
    
43. /usr/src/linux.git/mm/uksm.c:3740:4: error: too many arguments to function 'kmap_atomic'
    
44. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
45.                  from /usr/src/linux.git/mm/uksm.c:51:
    
46. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
47. /usr/src/linux.git/mm/uksm.c:3744:32: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
48. /usr/src/linux.git/mm/uksm.c:3744:4: error: 'kunmap_atomic' undeclared (first use in this function)
    
49. /usr/src/linux.git/mm/uksm.c: In function 'cal_positive_negative_costs':
    
50. /usr/src/linux.git/mm/uksm.c:5350:26: error: 'KM_USER0' undeclared (first use in this function)
    
51. /usr/src/linux.git/mm/uksm.c:5350:2: error: too many arguments to function 'kmap_atomic'
    
52. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
53.                  from /usr/src/linux.git/mm/uksm.c:51:
    
54. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
55. /usr/src/linux.git/mm/uksm.c:5351:26: error: 'KM_USER1' undeclared (first use in this function)
    
56. /usr/src/linux.git/mm/uksm.c:5351:2: error: too many arguments to function 'kmap_atomic'
    
57. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
58.                  from /usr/src/linux.git/mm/uksm.c:51:
    
59. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
60. /usr/src/linux.git/mm/uksm.c:5357:31: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
61. /usr/src/linux.git/mm/uksm.c:5357:2: error: 'kunmap_atomic' undeclared (first use in this function)
    
62. /usr/src/linux.git/mm/uksm.c:5358:31: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
63. /usr/src/linux.git/mm/uksm.c: In function 'init_zeropage_hash_table':
    
64. /usr/src/linux.git/mm/uksm.c:5392:27: error: 'KM_USER0' undeclared (first use in this function)
    
65. /usr/src/linux.git/mm/uksm.c:5392:2: error: too many arguments to function 'kmap_atomic'
    
66. In file included from /usr/src/linux.git/include/linux/pagemap.h:10:0,
    
67.                  from /usr/src/linux.git/mm/uksm.c:51:
    
68. /usr/src/linux.git/include/linux/highmem.h:66:21: note: declared here
    
69. /usr/src/linux.git/mm/uksm.c:5394:30: error: macro "kunmap_atomic" passed 2 arguments, but takes just 1
    
70. /usr/src/linux.git/mm/uksm.c:5394:2: error: 'kunmap_atomic' undeclared (first use in this function)
    
71. make[3]: *** [mm/uksm.o] Error 1
    
72. make[2]: *** [mm] Error 2
    
73. make[1]: *** [sub-make] Error 2
    
74. make: *** [all] Error 2

复制代码

xianai

xming 发表于 2012-10-5 22:10
it doens't compile :/

Hi ,  thanks for info

I was out for "Mid-autumn Festival" last week.
I gonna make a v3.6 patch in the coming few days.

xianai

xming 发表于 2012-10-5 22:10
it doens't compile :/

Hi,

It seems Mr. post-factum has already fixed the compiling for v3.6:
https://github.com/pfactum/pf-kernel/commits/pf-3.6

I will merge his fix to my git and clear some bugs and push uksm to 0.1.2.1 in the coming week.