luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'akpm' (patches from Andrew Morton)

Browse Source 
Merge fixes from Andrew Morton:
 "A few fixes.  One is a licensing change and I don't do licensing, so
  please eyeball that one"

Licensing eye-balled.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  lib/lz4: correct the LZ4 license
  memcg: get rid of swapaccount leftovers
  nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection
  nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error
  drivers/platform/olpc/olpc-ec.c: initialise earlier
This commit is contained in:
Linus Torvalds 2013-08-23 09:52:32 -07:00
commit 3db0d4defc
8 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/kernel-parameters.txt
View File

@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
improve throughput, but will also increase the improve throughput, but will also increase the
amount of memory reserved for use by the client. amount of memory reserved for use by the client.
swapaccount[=0|1] swapaccount=[0|1]
[KNL] Enable accounting of swap in memory resource [KNL] Enable accounting of swap in memory resource
controller if no parameter or 1 is given or disable controller if no parameter or 1 is given or disable
it if 0 is given (See Documentation/cgroups/memory.txt) it if 0 is given (See Documentation/cgroups/memory.txt)

2
drivers/platform/olpc/olpc-ec.c
View File

@ -330,7 +330,7 @@ static int __init olpc_ec_init_module(void)
return platform_driver_register(&olpc_ec_plat_driver); return platform_driver_register(&olpc_ec_plat_driver);
} }
module_init(olpc_ec_init_module); arch_initcall(olpc_ec_init_module);
MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>"); MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

5
fs/nilfs2/segbuf.c
View File

@ -345,8 +345,7 @@ static void nilfs_end_bio_write(struct bio *bio, int err)
if (err == -EOPNOTSUPP) { if (err == -EOPNOTSUPP) {
set_bit(BIO_EOPNOTSUPP, &bio->bi_flags); set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);
bio_put(bio); /* to be detected by nilfs_segbuf_submit_bio() */
/* to be detected by submit_seg_bio() */
} }
if (!uptodate) if (!uptodate)
@ -377,12 +376,12 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf,
bio->bi_private = segbuf; bio->bi_private = segbuf;
bio_get(bio); bio_get(bio);
submit_bio(mode, bio); submit_bio(mode, bio);
segbuf->sb_nbio++;
if (bio_flagged(bio, BIO_EOPNOTSUPP)) { if (bio_flagged(bio, BIO_EOPNOTSUPP)) {
bio_put(bio); bio_put(bio);
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
goto failed; goto failed;
} }
segbuf->sb_nbio++;
bio_put(bio); bio_put(bio);
wi->bio = NULL; wi->bio = NULL;

2
init/Kconfig
View File

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

4
lib/lz4/lz4_compress.c
View File

@ -437,7 +437,7 @@ int lz4_compress(const unsigned char *src, size_t src_len,
exit: exit:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(lz4_compress); EXPORT_SYMBOL(lz4_compress);
MODULE_LICENSE("GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("LZ4 compressor"); MODULE_DESCRIPTION("LZ4 compressor");

6
lib/lz4/lz4_decompress.c
View File

@ -299,7 +299,7 @@ int lz4_decompress(const char *src, size_t *src_len, char *dest,
return ret; return ret;
} }
#ifndef STATIC #ifndef STATIC
EXPORT_SYMBOL_GPL(lz4_decompress); EXPORT_SYMBOL(lz4_decompress);
#endif #endif
int lz4_decompress_unknownoutputsize(const char *src, size_t src_len, int lz4_decompress_unknownoutputsize(const char *src, size_t src_len,
@ -319,8 +319,8 @@ int lz4_decompress_unknownoutputsize(const char *src, size_t src_len,
return ret; return ret;
} }
#ifndef STATIC #ifndef STATIC
EXPORT_SYMBOL_GPL(lz4_decompress_unknownoutputsize); EXPORT_SYMBOL(lz4_decompress_unknownoutputsize);
MODULE_LICENSE("GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("LZ4 Decompressor"); MODULE_DESCRIPTION("LZ4 Decompressor");
#endif #endif

4
lib/lz4/lz4hc_compress.c
View File

@ -533,7 +533,7 @@ int lz4hc_compress(const unsigned char *src, size_t src_len,
exit: exit:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(lz4hc_compress); EXPORT_SYMBOL(lz4hc_compress);
MODULE_LICENSE("GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("LZ4HC compressor"); MODULE_DESCRIPTION("LZ4HC compressor");

1
mm/memcontrol.c
View File

@ -6969,7 +6969,6 @@ struct cgroup_subsys mem_cgroup_subsys = {
#ifdef CONFIG_MEMCG_SWAP #ifdef CONFIG_MEMCG_SWAP
static int __init enable_swap_account(char *s) static int __init enable_swap_account(char *s)
{ {
/* consider enabled if no parameter or 1 is given */
if (!strcmp(s, "1")) if (!strcmp(s, "1"))
really_do_swap_account = 1; really_do_swap_account = 1;
else if (!strcmp(s, "0")) else if (!strcmp(s, "0"))