Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix unused variable warning #186

Open
wants to merge 139 commits into
base: 4.14
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
a2b3531
merge: aufs4-kbuild
RobertCNelson Oct 5, 2018
3b19d0a
merge: aufs4-base
RobertCNelson Oct 5, 2018
10d4192
merge: aufs4-mmap
RobertCNelson Oct 5, 2018
c60e35f
merge: aufs4-standalone
RobertCNelson Oct 5, 2018
3a4678f
merge: aufs4
RobertCNelson Oct 5, 2018
e6ff922
Revert "nohz: Fix missing tick reprogram when interrupting an inline …
RobertCNelson Oct 5, 2018
c960528
merge: WireGuard
RobertCNelson Oct 5, 2018
a6671ab
add am33x firmware
RobertCNelson Jun 20, 2018
d7f7793
backports: typec: from: linux.git
RobertCNelson Oct 4, 2018
e8eae2a
unstage typec
RobertCNelson Oct 4, 2018
9e67ff1
Revert "eeprom: at24: check if the chip is functional in probe()"
RobertCNelson Nov 1, 2016
d1baaba
Revert: tis overlay setup
RobertCNelson Jun 12, 2018
b04a63f
ar1021_i2c: add invert/swap options
RobertCNelson Jan 29, 2018
19f55a8
ar1021_i2c.c: introduce offsets to manually re-calbrate screen
RobertCNelson Jan 29, 2018
79e4373
btrfs: raid6: pick either raid6_neonx2 or raid6_intx4, saves 1 second…
RobertCNelson Dec 11, 2017
36d6613
pwm: Create device class for pwm channels
May 1, 2017
c950b75
driver: SND_PWMSP
RobertCNelson Aug 4, 2018
d49b9e0
NFM: spi: spidev: allow use of spidev in DT
RobertCNelson Aug 4, 2016
449fad4
fb_ssd1306: add support for MikroElectronica OLED B Click
Jan 22, 2018
3bff0f7
tsl2550: fix lux1_input error in low light
mranostay Jun 3, 2013
8dc6d48
HACK: tps65217_pwr_but
RobertCNelson Oct 28, 2016
92104f3
cpufreq: opp: dont fail _opp_add_static_v2, temp till overlays repo m…
RobertCNelson Sep 20, 2017
b36ebde
wiznet: w5100-spi: hack dt support for w5500
RobertCNelson Oct 5, 2017
7146c5f
gitignore: Ignore DTB files
pantoniou Feb 21, 2014
ddf5790
omap: Fix crash when omap device is disabled
pantoniou Mar 8, 2016
70c600f
serial: omap: Fix port line number without aliases
pantoniou Nov 6, 2014
da08443
tty: omap-serial: Fix up platform data alloc
pantoniou Dec 9, 2013
c60da25
of: overlay: kobjectify overlay objects
pantoniou Mar 15, 2015
4463e2c
of: overlay: global sysfs enable attribute
pantoniou Mar 17, 2015
a323688
Documentation: ABI: overlays - global attributes
pantoniou Mar 17, 2015
5f5f706
Documentation: document of_overlay_disable parameter
pantoniou Oct 22, 2015
01cbd43
of: overlay: add per overlay sysfs attributes
pantoniou Apr 23, 2015
8ed8fc0
Documentation: ABI: overlays - per overlay docs
pantoniou Oct 22, 2015
373a50b
of: dynamic: Add __of_node_dupv()
pantoniou Jun 10, 2015
6aa491c
of: changesets: Introduce changeset helper methods
pantoniou Jun 10, 2015
4ef7248
of: changeset: Add of_changeset_node_move method
pantoniou May 16, 2016
339d1d1
of: unittest: changeset helpers
pantoniou Oct 14, 2015
fe15962
OF: DT-Overlay configfs interface (v7)
pantoniou Dec 4, 2013
7ef838a
ARM: DT: Enable symbols when CONFIG_OF_OVERLAY is used
pantoniou Dec 6, 2014
52ecab5
misc: Beaglebone capemanager
pantoniou May 6, 2015
52a4a2b
doc: misc: Beaglebone capemanager documentation
pantoniou May 13, 2015
e91438f
doc: dt: beaglebone cape manager bindings.
pantoniou May 12, 2015
2b62ba3
doc: ABI: bone_capemgr sysfs API
pantoniou May 12, 2015
4622501
MAINTAINERS: Beaglebone capemanager maintainer
pantoniou May 13, 2015
0ce188e
arm: dts: Enable beaglebone cape-manager
pantoniou May 12, 2015
a77b4c2
of: overlay: Implement target index support
pantoniou May 21, 2015
cd12046
of: unittest: Add indirect overlay target test
pantoniou May 21, 2015
76df759
doc: dt: Document the indirect overlay method.
pantoniou Jun 12, 2015
e38deb0
of: overlay: Introduce target root capability.
pantoniou Jun 12, 2015
7f2558f
of: unittest: Unit-tests for target root overlays.
pantoniou Jun 12, 2015
580baf2
doc: dt: Document the target root overlay method
pantoniou Jun 12, 2015
c38693b
RFC: Device overlay manager (PCI/USB + DT)
pantoniou May 21, 2015
e958b62
of: rename *_node_sysfs to _node_post
pantoniou Oct 14, 2015
efc748b
of: Support hashtable lookups for phandles
pantoniou Oct 14, 2015
4c6f16b
of: unittest: hashed phandles unitest
pantoniou May 16, 2016
09f14cb
of: overlay: Pick up label symbols from overlays.
pantoniou Mar 22, 2016
fd6e16b
bone_capemgr: uboot_capemgr_enabled flag
RobertCNelson Mar 1, 2017
1638e3f
bone_capemgr: kill with uboot flag
RobertCNelson Sep 12, 2017
d642459
fix: include/linux/of.h add linux/slab.h include
RobertCNelson Sep 24, 2018
e04d045
cpsw: search for phy
May 19, 2015
5b2f313
ti: dra7: etnaviv: 2d acceleration
RobertCNelson Mar 9, 2018
8112b7e
tieqep: forward port of Nathaniel Lewis eQEP driver
RobertCNelson Nov 2, 2016
5d9d306
tieqep: fix unhandled fault on eQEP register access
pdp7 Feb 2, 2017
4f707b5
ARM: samples seccomp no -m32
RobertCNelson Oct 30, 2015
b724908
Fix remoteproc to work with the PRU GNU Binutils port
dinuxbg Aug 31, 2016
a60bc56
quiet: 8250_omap.c use pr_info over pr_err
RobertCNelson Jul 16, 2015
bd2a503
am33xx: spi: we want spidev1/spidev2 for compability with v4.4/v4.9
RobertCNelson Jun 15, 2018
e8fccb9
ti_am335x_tsc.c driver
Jan 3, 2018
de369e1
ti_am335x_tsc: correct formula code to calculate pressure; fix touchs…
fagle May 11, 2017
3dcce22
Making the uio pruss driver work
eliasbakken Apr 9, 2015
9b06d72
fix some uio_pruss braindamage
mvduin Jan 31, 2017
432216e
uio_pruss: minor cleanup
mvduin Jun 28, 2017
794f98b
uio_pruss: fix unbalanced pm_runtime calls
mvduin Jun 28, 2017
e1dbebb
uio_pruss: add names to memory regions
mvduin Jun 29, 2017
206dbde
BeagleBone pinmux helper
RobertCNelson Sep 28, 2017
3f09d93
am33xx: add gpio line names
Jan 2, 2018
52e2f1a
hack: gpiolib: yes we have drivers stomping on each other...
RobertCNelson Feb 15, 2018
24e00e0
am335x-bone-common.dtsi: drop mcasp0_aclkr.mmc0_sdwp
RobertCNelson Jun 18, 2018
2417d9e
ARM: dts: am335x-bone-common: update leds to match 3.8.13 kernel
RobertCNelson Aug 27, 2014
c1170d0
ARM: dts: am335x-bone-common: add collision and carrier sense pinmux
spatton-ti Jan 5, 2015
8038bae
ARM: dts: am335x-bone-common: disable running JTAG
RobertCNelson Mar 9, 2018
7f23c46
ARM: dts: am335x-bone-common: add no-capemgr.dtsi
RobertCNelson Nov 20, 2017
be98073
ARM: dts: am335x-bone-common: add am335x-bbw-bbb-base.h
RobertCNelson Mar 1, 2017
84e6521
am335x-bone-common-no-capemgr: add pruss node
RobertCNelson Feb 15, 2018
3fe8550
add: am335x-boneblack-uboot.dts
RobertCNelson Sep 20, 2017
d2a1b7a
am335x-bone-common: config-pin: carve out P9.19/P9.20
RobertCNelson Jan 19, 2018
614bb56
ARM: dts: Add am335x-boneblue: fix pin wl1835 uses for interrupt
RobertCNelson Dec 18, 2017
6209194
am335x-boneblue.dts: add usarts
RobertCNelson Sep 20, 2017
87833ce
am335x-boneblue.dts: add dcan
RobertCNelson Dec 18, 2017
412eedf
am335x-boneblue.dts: sync with ti-4.14
RobertCNelson Dec 19, 2017
fcf0ca2
am335x-boneblue: add pruss node
RobertCNelson Feb 15, 2018
b149650
blue: sync with older v4.4.x/v4.9.x version
RobertCNelson Mar 9, 2018
bfda572
am335x-boneblue.dts: fix rtc off
RobertCNelson Apr 5, 2018
1e00ffb
blue: fix spidev name
RobertCNelson Jun 26, 2018
bcdba99
drop: am335x-bone-common-universal.dtsi
RobertCNelson Aug 29, 2018
f6cdd58
add: am335x-sancloud-bbe
RobertCNelson Mar 1, 2017
a703f05
gpu: drm: i2c: add alternative adv7511 driver with audio support
Sep 10, 2015
f62920b
gpu: drm: i2c: adihdmi: componentize driver and huge reformat/cleanup
ohporter Nov 6, 2015
7d351fb
ARM: dts: add Arrow BeagleBone Black Industrial dts
ohporter Nov 3, 2015
30271c2
drm/adihdmi: Drop dummy save/restore hooks
RobertCNelson Jan 26, 2016
019dd84
drm/adihdmi: Pass 'name' to drm_encoder_init()
RobertCNelson Jan 26, 2016
b5ff9fb
adihdmi_drv: reg_default -> reg_sequence
RobertCNelson Mar 28, 2016
63e209b
adihdmi_drv fix drm_of.h include
RobertCNelson Jul 14, 2017
e6ba933
ARM: dts: Add support for Olimex AM3352-SOM
vinifr Dec 6, 2015
9461ce4
ARM: dts: am335x-boneblack: enable wl1835mod cape support
eyalreizer May 5, 2015
0c352da
add: am335x-boneblack-bbbmini.dts
RobertCNelson May 11, 2017
8bc1d56
add: lcd: am335x-boneblack-bbb-exp-c.dtb am335x-boneblack-bbb-exp-r.dtb
RobertCNelson May 11, 2017
5977e27
bb: audio cape
RobertCNelson May 11, 2017
a6aa4e6
add: am335x-pocketbeagle.dtb
RobertCNelson Oct 3, 2017
5bb82a1
am335x-pocketbeagle.dts: disable unrounted spi selects
RobertCNelson Oct 23, 2017
51cd8e3
am335x-pocketbeagle.dts: fix spi add can0
RobertCNelson Oct 27, 2017
e209971
pocketbeagle: fix P2_24
RobertCNelson Nov 2, 2017
a9cb27a
PocketBeagle: fix pruin default settings
RobertCNelson Dec 7, 2017
c6f6ee0
am335x-pocketbeagle.dts: enable spidev1.0
RobertCNelson Dec 11, 2017
1683e08
add: am335x-pocketbeagle-simplegaming
RobertCNelson Jan 3, 2018
a464617
am335x-pocketbeagle: add pruss node
RobertCNelson Feb 15, 2018
8e83a71
am335x-pocketbeagle: fix rtc off
RobertCNelson Apr 5, 2018
6f0c4e5
am335x: pru: let u-boot load the correct mode
RobertCNelson Jun 12, 2018
fdb96b3
fix uart4, i2c1, and i2c2 in blue dts
May 5, 2018
f658066
copy roboticscape device tree from 4.9 to 4.14
May 5, 2018
dddefd4
am335x-roboticscape.dtsi: fix pruss
RobertCNelson Jun 23, 2018
162aff6
roboticscape: librobotcontrol expects /dev/spidev1
RobertCNelson Jun 26, 2018
60ba7c3
blue: sync with https://github.com/StrawsonDesign/librobotcontrol
RobertCNelson Jul 27, 2018
2377b5e
am335x-roboticscape.dtsi: drop spi2 property
RobertCNelson Aug 4, 2018
f41d88c
blue: fix P9_28/P9_31 spi pin references
RobertCNelson Aug 29, 2018
6a8e528
blue/roboticape: fix usart/spi (merge with 1.0.3)
RobertCNelson Oct 5, 2018
f37c8be
uboot: cape-universal enablement
RobertCNelson Jul 27, 2018
dde76c5
x15: add cmem
RobertCNelson Jul 31, 2018
b175f77
x15: cmem: increase OpenCL global memory to utilze all 4 EVE cores
RobertCNelson Aug 20, 2018
906a46f
dra7: add ti pwmss eqep
stashlukj Sep 7, 2018
30581fc
dra7: complete pru iodelay table
stashlukj Sep 20, 2018
e194245
sync: am335x-peripheral/pinmux
RobertCNelson Mar 1, 2017
877ed81
auto generated: capes: add dtbs to makefile
RobertCNelson Jul 27, 2018
996877d
am335x: enable sgx
RobertCNelson Mar 9, 2018
8ee4586
packaging: sync builddeb changes
RobertCNelson Jun 12, 2018
66fe57c
enable: Jenkins: http://rcn-ee.online:8080
RobertCNelson Jun 22, 2018
2b709fd
4.14.71-ti-r80 patchset
RobertCNelson Oct 5, 2018
e076769
4.14.71-ti-r80 bb.org_defconfig
RobertCNelson Oct 5, 2018
80b6642
fix unused variable warning
neutered Oct 20, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge: aufs4-base
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
RobertCNelson committed Oct 5, 2018
commit 3b19d0a6d94c9a782af441b9efc31bd8336af1e8
13 changes: 13 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -2474,6 +2474,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*

AUFS (advanced multi layered unification filesystem) FILESYSTEM
M: "J. R. Okajima" <hooanon05g@gmail.com>
L: linux-unionfs@vger.kernel.org
L: aufs-users@lists.sourceforge.net (members only)
W: http://aufs.sourceforge.net
T: git://github.com/sfjro/aufs4-linux.git
S: Supported
F: Documentation/filesystems/aufs/
F: Documentation/ABI/testing/debugfs-aufs
F: Documentation/ABI/testing/sysfs-aufs
F: fs/aufs/
F: include/uapi/linux/aufs_type.h

AUXILIARY DISPLAY DRIVERS
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
W: http://miguelojeda.es/auxdisplay.htm
18 changes: 18 additions & 0 deletions drivers/block/loop.c
Original file line number Diff line number Diff line change
@@ -710,6 +710,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}

/*
* for AUFS
* no get/put for file.
*/
struct file *loop_backing_file(struct super_block *sb)
{
struct file *ret;
struct loop_device *l;

ret = NULL;
if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
l = sb->s_bdev->bd_disk->private_data;
ret = l->lo_backing_file;
}
return ret;
}
EXPORT_SYMBOL_GPL(loop_backing_file);

/* loop sysfs attributes */

static ssize_t loop_attr_show(struct device *dev, char *page,
2 changes: 1 addition & 1 deletion fs/dcache.c
Original file line number Diff line number Diff line change
@@ -1207,7 +1207,7 @@ enum d_walk_ret {
*
* The @enter() and @finish() callbacks are called with d_lock held.
*/
static void d_walk(struct dentry *parent, void *data,
void d_walk(struct dentry *parent, void *data,
enum d_walk_ret (*enter)(void *, struct dentry *),
void (*finish)(void *))
{
4 changes: 3 additions & 1 deletion fs/fcntl.c
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@

#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)

static int setfl(int fd, struct file * filp, unsigned long arg)
int setfl(int fd, struct file * filp, unsigned long arg)
{
struct inode * inode = file_inode(filp);
int error = 0;
@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)

if (filp->f_op->check_flags)
error = filp->f_op->check_flags(arg);
if (!error && filp->f_op->setfl)
error = filp->f_op->setfl(filp, arg);
if (error)
return error;

2 changes: 1 addition & 1 deletion fs/inode.c
Original file line number Diff line number Diff line change
@@ -1656,7 +1656,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
static int update_time(struct inode *inode, struct timespec *time, int flags)
int update_time(struct inode *inode, struct timespec *time, int flags)
{
int (*update_time)(struct inode *, struct timespec *, int);

6 changes: 6 additions & 0 deletions fs/namespace.c
Original file line number Diff line number Diff line change
@@ -855,6 +855,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}

/* for aufs, CONFIG_AUFS_BR_FUSE */
int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}

/*
* vfsmount lock must be held for write
*/
22 changes: 22 additions & 0 deletions fs/read_write.c
Original file line number Diff line number Diff line change
@@ -484,6 +484,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
return -EINVAL;
}

vfs_readf_t vfs_readf(struct file *file)
{
const struct file_operations *fop = file->f_op;

if (fop->read)
return fop->read;
if (fop->read_iter)
return new_sync_read;
return ERR_PTR(-ENOSYS);
}

vfs_writef_t vfs_writef(struct file *file)
{
const struct file_operations *fop = file->f_op;

if (fop->write)
return fop->write;
if (fop->write_iter)
return new_sync_write;
return ERR_PTR(-ENOSYS);
}

ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
{
mm_segment_t old_fs;
10 changes: 5 additions & 5 deletions fs/splice.c
Original file line number Diff line number Diff line change
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
loff_t *ppos, size_t len, unsigned int flags)
long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
loff_t *ppos, size_t len, unsigned int flags)
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
@@ -854,9 +854,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
/*
* Attempt to initiate a splice from a file to a pipe.
*/
static long do_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags)
long do_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags)
{
ssize_t (*splice_read)(struct file *, loff_t *,
struct pipe_inode_info *, size_t, unsigned int);
2 changes: 1 addition & 1 deletion fs/sync.c
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
* wait == 1 case since in that case write_inode() functions do
* sync_dirty_buffer() and thus effectively write one block at a time.
*/
static int __sync_filesystem(struct super_block *sb, int wait)
int __sync_filesystem(struct super_block *sb, int wait)
{
if (wait)
sync_inodes_sb(sb);
1 change: 1 addition & 0 deletions include/linux/file.h
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ struct dentry;
struct path;
extern struct file *alloc_file(const struct path *, fmode_t mode,
const struct file_operations *fop);
extern struct file *get_empty_filp(void);

static inline void fput_light(struct file *file, int fput_needed)
{
10 changes: 10 additions & 0 deletions include/linux/fs.h
Original file line number Diff line number Diff line change
@@ -1265,6 +1265,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);

extern int setfl(int fd, struct file * filp, unsigned long arg);
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
@@ -1712,6 +1713,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
int (*setfl)(struct file *, unsigned long);
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1782,6 +1784,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);

typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *);
typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t,
loff_t *);
vfs_readf_t vfs_readf(struct file *file);
vfs_writef_t vfs_writef(struct file *file);

extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2184,6 +2192,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec *, int);
extern int update_time(struct inode *, struct timespec *, int);

/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2464,6 +2473,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
extern int __sync_filesystem(struct super_block *, int);
extern int sync_filesystem(struct super_block *);
extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops;
3 changes: 3 additions & 0 deletions include/linux/lockdep.h
Original file line number Diff line number Diff line change
@@ -406,6 +406,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}

struct lock_class *lockdep_hlock_class(struct held_lock *hlock);

/*
* Acquire a lock.
*
@@ -530,6 +532,7 @@ struct lock_class_key { };

#define lockdep_depth(tsk) (0)

#define lockdep_is_held(lock) (1)
#define lockdep_is_held_type(l, r) (1)

#define lockdep_assert_held(l) do { (void)(l); } while (0)
3 changes: 3 additions & 0 deletions include/linux/mnt_namespace.h
Original file line number Diff line number Diff line change
@@ -6,11 +6,14 @@
struct mnt_namespace;
struct fs_struct;
struct user_namespace;
struct vfsmount;

extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
struct user_namespace *, struct fs_struct *);
extern void put_mnt_ns(struct mnt_namespace *ns);

extern int is_current_mnt_ns(struct vfsmount *mnt);

extern const struct file_operations proc_mounts_operations;
extern const struct file_operations proc_mountinfo_operations;
extern const struct file_operations proc_mountstats_operations;
6 changes: 6 additions & 0 deletions include/linux/splice.h
Original file line number Diff line number Diff line change
@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);

extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
extern const struct pipe_buf_operations default_pipe_buf_ops;

extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
loff_t *ppos, size_t len, unsigned int flags);
extern long do_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags);
#endif
3 changes: 2 additions & 1 deletion kernel/locking/lockdep.c
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
unsigned long nr_lock_classes;
static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];

static inline struct lock_class *hlock_class(struct held_lock *hlock)
inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
{
if (!hlock->class_idx) {
/*
@@ -154,6 +154,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
}
return lock_classes + hlock->class_idx - 1;
}
#define hlock_class(hlock) lockdep_hlock_class(hlock)

#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);