+1 -1

Documentation/kernel-parameters.txt

reviewed

··· 2953 2953 improve throughput, but will also increase the 2954 2954 amount of memory reserved for use by the client. 2955 2955 2956 2956 - swapaccount[=0|1] 2956 2956 + swapaccount=[0|1] 2957 2957 [KNL] Enable accounting of swap in memory resource 2958 2958 controller if no parameter or 1 is given or disable 2959 2959 it if 0 is given (See Documentation/cgroups/memory.txt)

+1 -1

drivers/platform/olpc/olpc-ec.c

reviewed

··· 330 330 return platform_driver_register(&olpc_ec_plat_driver); 331 331 } 332 332 333 333 - module_init(olpc_ec_init_module); 333 333 + arch_initcall(olpc_ec_init_module); 334 334 335 335 MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>"); 336 336 MODULE_LICENSE("GPL");

+2 -3

fs/nilfs2/segbuf.c

reviewed

··· 345 345 346 346 if (err == -EOPNOTSUPP) { 347 347 set_bit(BIO_EOPNOTSUPP, &bio->bi_flags); 348 348 - bio_put(bio); 349 349 - /* to be detected by submit_seg_bio() */ 348 348 + /* to be detected by nilfs_segbuf_submit_bio() */ 350 349 } 351 350 352 351 if (!uptodate) ··· 376 377 bio->bi_private = segbuf; 377 378 bio_get(bio); 378 379 submit_bio(mode, bio); 380 380 + segbuf->sb_nbio++; 379 381 if (bio_flagged(bio, BIO_EOPNOTSUPP)) { 380 382 bio_put(bio); 381 383 err = -EOPNOTSUPP; 382 384 goto failed; 383 385 } 384 384 - segbuf->sb_nbio++; 385 386 bio_put(bio); 386 387 387 388 wi->bio = NULL;

+1 -1

init/Kconfig

reviewed

··· 955 955 Memory Resource Controller Swap Extension comes with its price in 956 956 a bigger memory consumption. General purpose distribution kernels 957 957 which want to enable the feature but keep it disabled by default 958 958 - and let the user enable it by swapaccount boot command line 958 958 + and let the user enable it by swapaccount=1 boot command line 959 959 parameter should have this option unselected. 960 960 For those who want to have the feature enabled by default should 961 961 select this option (if, for some reason, they need to disable it

+2 -2

lib/lz4/lz4_compress.c

reviewed

··· 437 437 exit: 438 438 return ret; 439 439 } 440 440 - EXPORT_SYMBOL_GPL(lz4_compress); 440 440 + EXPORT_SYMBOL(lz4_compress); 441 441 442 442 - MODULE_LICENSE("GPL"); 442 442 + MODULE_LICENSE("Dual BSD/GPL"); 443 443 MODULE_DESCRIPTION("LZ4 compressor");

+3 -3

lib/lz4/lz4_decompress.c

reviewed

··· 299 299 return ret; 300 300 } 301 301 #ifndef STATIC 302 302 - EXPORT_SYMBOL_GPL(lz4_decompress); 302 302 + EXPORT_SYMBOL(lz4_decompress); 303 303 #endif 304 304 305 305 int lz4_decompress_unknownoutputsize(const char *src, size_t src_len, ··· 319 319 return ret; 320 320 } 321 321 #ifndef STATIC 322 322 - EXPORT_SYMBOL_GPL(lz4_decompress_unknownoutputsize); 322 322 + EXPORT_SYMBOL(lz4_decompress_unknownoutputsize); 323 323 324 324 - MODULE_LICENSE("GPL"); 324 324 + MODULE_LICENSE("Dual BSD/GPL"); 325 325 MODULE_DESCRIPTION("LZ4 Decompressor"); 326 326 #endif

+2 -2

lib/lz4/lz4hc_compress.c

reviewed

··· 533 533 exit: 534 534 return ret; 535 535 } 536 536 - EXPORT_SYMBOL_GPL(lz4hc_compress); 536 536 + EXPORT_SYMBOL(lz4hc_compress); 537 537 538 538 - MODULE_LICENSE("GPL"); 538 538 + MODULE_LICENSE("Dual BSD/GPL"); 539 539 MODULE_DESCRIPTION("LZ4HC compressor");

-1

mm/memcontrol.c

reviewed

··· 6969 6969 #ifdef CONFIG_MEMCG_SWAP 6970 6970 static int __init enable_swap_account(char *s) 6971 6971 { 6972 6972 - /* consider enabled if no parameter or 1 is given */ 6973 6972 if (!strcmp(s, "1")) 6974 6973 really_do_swap_account = 1; 6975 6974 else if (!strcmp(s, "0"))