History

Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict

Ingo Molnar committed 6 years ago

Commit 31c7ac32 parents 28336be c79f46a197 files · +1378 −921Browse files

Showing the changes to include/linux (7 of 197 files). Show all

Unified · Split

7 files
  1. include/linux/bio.h +1 −0
  2. include/linux/dmaengine.h +4 −1
  3. include/linux/kernel.h +0 −9
  4. include/linux/memory_hotplug.h +5 −2
  5. include/linux/of_mdio.h +1 −1
  6. include/linux/posix-clock.h +11 −8
  7. include/linux/syscalls.h +1 −0
include/linux/bio.h+1−0
@@ -470,6 +470,7 @@ extern struct bio *bio_copy_user_iov(struct request_queue *, · 469 unmodified lines
470470 gfp_t);
471471 extern int bio_uncopy_user(struct bio *);
472472 void zero_fill_bio_iter(struct bio *bio, struct bvec_iter iter);
473+void bio_truncate(struct bio *bio, unsigned new_size);
473474
474475 static inline void zero_fill_bio(struct bio *bio)
475476 {
include/linux/dmaengine.h+4−1
@@ -1364,8 +1364,11 @@ static inline int dma_get_slave_caps(struct dma_chan *chan, · 1363 unmodified lines
13641364 static inline int dmaengine_desc_set_reuse(struct dma_async_tx_descriptor *tx)
13651365 {
13661366 struct dma_slave_caps caps;
1367+ int ret;
13671368
1368− dma_get_slave_caps(tx->chan, &caps);
1369+ ret = dma_get_slave_caps(tx->chan, &caps);
1370+ if (ret)
1371+ return ret;
13691372
13701373 if (caps.descriptor_reuse) {
13711374 tx->flags |= DMA_CTRL_REUSE;
include/linux/kernel.h+0−9
@@ -79,15 +79,6 @@ · 78 unmodified lines
7979 */
8080 #define round_down(x, y) ((x) & ~__round_mask(x, y))
8181
82−/**
83− * FIELD_SIZEOF - get the size of a struct's field
84− * @t: the target struct
85− * @f: the target struct's field
86− * Return: the size of @f in the struct definition without having a
87− * declared instance of @t.
88− */
89−#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
90−
9182 #define typeof_member(T, m) typeof(((T*)0)->m)
9283
9384 #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP
include/linux/memory_hotplug.h+5−2
@@ -122,8 +122,8 @@ static inline bool movable_node_is_enabled(void) · 121 unmodified lines
122122
123123 extern void arch_remove_memory(int nid, u64 start, u64 size,
124124 struct vmem_altmap *altmap);
125−extern void __remove_pages(struct zone *zone, unsigned long start_pfn,
126− unsigned long nr_pages, struct vmem_altmap *altmap);
125+extern void __remove_pages(unsigned long start_pfn, unsigned long nr_pages,
126+ struct vmem_altmap *altmap);
127127
128128 /* reasonably generic interface to expand the physical pages */
129129 extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
@@ -342,6 +342,9 @@ extern int add_memory(int nid, u64 start, u64 size); · 212 unmodified lines
342342 extern int add_memory_resource(int nid, struct resource *resource);
343343 extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
344344 unsigned long nr_pages, struct vmem_altmap *altmap);
345+extern void remove_pfn_range_from_zone(struct zone *zone,
346+ unsigned long start_pfn,
347+ unsigned long nr_pages);
345348 extern bool is_memblock_offlined(struct memory_block *mem);
346349 extern int sparse_add_section(int nid, unsigned long pfn,
347350 unsigned long nr_pages, struct vmem_altmap *altmap);
include/linux/of_mdio.h+1−1
@@ -55,7 +55,7 @@ static inline int of_mdio_parse_addr(struct device *dev, · 54 unmodified lines
5555 }
5656
5757 #else /* CONFIG_OF_MDIO */
58−static bool of_mdiobus_child_is_phy(struct device_node *child)
58+static inline bool of_mdiobus_child_is_phy(struct device_node *child)
5959 {
6060 return false;
6161 }
include/linux/posix-clock.h+11−8
@@ -69,29 +69,32 @@ struct posix_clock_operations { · 68 unmodified lines
6969 *
7070 * @ops: Functional interface to the clock
7171 * @cdev: Character device instance for this clock
72− * @kref: Reference count.
72+ * @dev: Pointer to the clock's device.
7373 * @rwsem: Protects the 'zombie' field from concurrent access.
7474 * @zombie: If 'zombie' is true, then the hardware has disappeared.
75− * @release: A function to free the structure when the reference count reaches
76− * zero. May be NULL if structure is statically allocated.
7775 *
7876 * Drivers should embed their struct posix_clock within a private
7977 * structure, obtaining a reference to it during callbacks using
8078 * container_of().
79+ *
80+ * Drivers should supply an initialized but not exposed struct device
81+ * to posix_clock_register(). It is used to manage lifetime of the
82+ * driver's private structure. It's 'release' field should be set to
83+ * a release function for this private structure.
8184 */
8285 struct posix_clock {
8386 struct posix_clock_operations ops;
8487 struct cdev cdev;
85− struct kref kref;
88+ struct device *dev;
8689 struct rw_semaphore rwsem;
8790 bool zombie;
88− void (*release)(struct posix_clock *clk);
8991 };
9092
9193 /**
9294 * posix_clock_register() - register a new clock
93− * @clk: Pointer to the clock. Caller must provide 'ops' and 'release'
94− * @devid: Allocated device id
95+ * @clk: Pointer to the clock. Caller must provide 'ops' field
96+ * @dev: Pointer to the initialized device. Caller must provide
97+ * 'release' field
9598 *
9699 * A clock driver calls this function to register itself with the
97100 * clock device subsystem. If 'clk' points to dynamically allocated
@@ -100,7 +103,7 @@ struct posix_clock { · 2 unmodified lines
100103 *
101104 * Returns zero on success, non-zero otherwise.
102105 */
103−int posix_clock_register(struct posix_clock *clk, dev_t devid);
106+int posix_clock_register(struct posix_clock *clk, struct device *dev);
104107
105108 /**
106109 * posix_clock_unregister() - unregister a clock
include/linux/syscalls.h+1−0
@@ -1232,6 +1232,7 @@ asmlinkage long sys_ni_syscall(void); · 1231 unmodified lines
12321232 */
12331233
12341234 int ksys_umount(char __user *name, int flags);
1235+int ksys_dup(unsigned int fildes);
12351236 int ksys_chroot(const char __user *filename);
12361237 ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count);
12371238 int ksys_chdir(const char __user *filename);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t