projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 08aa9d92 | 1 | --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 |
| 2 | +++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 | |
| 3 | @@ -15,7 +15,8 @@ | |
| 4 | #include <stdio.h> | |
| 5 | #include <ctype.h> | |
| 6 | #include "modpost.h" | |
| 7 | -#include "../../include/generated/autoconf.h" | |
| 8 | +// PLD architectures don't use CONFIG_SYMBOL_PREFIX | |
| 9 | +//#include "../../include/generated/autoconf.h" | |
| 10 | #include "../../include/linux/license.h" | |
| 11 | ||
| 12 | /* Some toolchains use a `_' prefix for all user symbols. */ | |
| 13 | ||
| 2136e199 AM |
14 | --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 |
| 15 | +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 | |
| 16 | @@ -9,6 +9,12 @@ | |
| 17 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | |
| 18 | if [ $? -eq 0 ]; then | |
| 19 | echo "-l${lib}" | |
| 20 | + for libt in tinfow tinfo ; do | |
| 21 | + $cc -print-file-name=lib${libt}.${ext} | grep -q / | |
| 22 | + if [ $? -eq 0 ]; then | |
| 23 | + echo "-l${libt}" | |
| 24 | + fi | |
| 25 | + done | |
| 26 | exit | |
| 27 | fi | |
| 28 | done | |
| a221fc0a | 29 | |
| 5a002ca3 AM |
30 | From: Shaohua Li <shli@fb.com> |
| 31 | ||
| 32 | Basically this is a copy of commit 001e4a8775f6(ext4: implement cgroup | |
| 33 | writeback support). Tested with a fio test, verified writeback is | |
| 34 | throttled against cgroup io.max write bandwidth, also verified moving | |
| 35 | the fio test to another cgroup and the writeback is throttled against | |
| 36 | new cgroup setting. | |
| 37 | ||
| 38 | Cc: Tejun Heo <tj@kernel.org> | |
| 39 | Signed-off-by: Shaohua Li <shli@fb.com> | |
| 40 | --- | |
| 41 | fs/xfs/xfs_aops.c | 2 ++ | |
| 42 | fs/xfs/xfs_super.c | 1 + | |
| 43 | 2 files changed, 3 insertions(+) | |
| 44 | ||
| 45 | diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c | |
| 46 | index f18e593..6535054 100644 | |
| 47 | --- a/fs/xfs/xfs_aops.c | |
| 48 | +++ b/fs/xfs/xfs_aops.c | |
| 49 | @@ -630,8 +630,10 @@ xfs_add_to_ioend( | |
| 50 | if (wpc->ioend) | |
| 51 | list_add(&wpc->ioend->io_list, iolist); | |
| 52 | wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset, bh); | |
| 53 | + wbc_init_bio(wbc, wpc->ioend->io_bio); | |
| 54 | } | |
| 55 | ||
| 56 | + wbc_account_io(wbc, bh->b_page, bh->b_size); | |
| 57 | /* | |
| 58 | * If the buffer doesn't fit into the bio we need to allocate a new | |
| 59 | * one. This shouldn't happen more than once for a given buffer. | |
| 60 | diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c | |
| 61 | index 584cf2d..aea3bc2 100644 | |
| 62 | --- a/fs/xfs/xfs_super.c | |
| 63 | +++ b/fs/xfs/xfs_super.c | |
| 64 | @@ -1634,6 +1634,7 @@ xfs_fs_fill_super( | |
| 65 | sb->s_max_links = XFS_MAXLINK; | |
| 66 | sb->s_time_gran = 1; | |
| 67 | set_posix_acl_flag(sb); | |
| 68 | + sb->s_iflags |= SB_I_CGROUPWB; | |
| 69 | ||
| 70 | /* version 5 superblocks support inode version counters. */ | |
| 71 | if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5) |