diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 11:06:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 11:06:35 +1100 |
| commit | a6b3276bc84590ce4737212668a66651a65b84a8 (patch) | |
| tree | d22659b4fd0ca50e209a10bfb0c91e69773c3f97 /include | |
| parent | 7835418c1b42bb0529e04b1d705bb3ec051f4e16 (diff) | |
| parent | 7dbfdd2f0efbd2ba43d2edb7b1a8d32b78c458ef (diff) | |
Merge branch 'quilt/driver-core.current'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/debugfs.h | 8 | ||||
| -rw-r--r-- | include/linux/klist.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index 23936b16426b..019a8b82fd6b 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h @@ -162,6 +162,14 @@ static inline struct dentry *debugfs_create_x32(const char *name, mode_t mode, return ERR_PTR(-ENODEV); } +static inline struct dentry *debugfs_create_size_t(const char *name, + mode_t mode, + struct dentry *parent, + size_t *value) +{ + return ERR_PTR(-ENODEV); +} + static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode, struct dentry *parent, u32 *value) diff --git a/include/linux/klist.h b/include/linux/klist.h index d5a27af9dba5..e91a4e59b771 100644 --- a/include/linux/klist.h +++ b/include/linux/klist.h @@ -22,7 +22,7 @@ struct klist { struct list_head k_list; void (*get)(struct klist_node *); void (*put)(struct klist_node *); -}; +} __attribute__ ((aligned (4))); #define KLIST_INIT(_name, _get, _put) \ { .k_lock = __SPIN_LOCK_UNLOCKED(_name.k_lock), \ |