Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 038c0dcd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge d2d0b95c ("block: Remove special-casing of compound pages") into android-mainline 



Steps on the way to 4.19.307

Change-Id: Ia57840d96d36c5c4a67be2f7c69807e449728406
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 01a4672a d2d0b95c

arch/parisc/kernel/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ static unsigned long f_extend(unsigned long address) 
#ifdef CONFIG_64BIT

	if(unlikely(parisc_narrow_firmware)) {

		if((address & 0xff000000) == 0xf0000000)

			return 0xf0f0f0f000000000UL | (u32)address;

			return (0xfffffff0UL << 32) | (u32)address;



		if((address & 0xf0000000) == 0xf0000000)

			return 0xffffffff00000000UL | (u32)address;

			return (0xffffffffUL << 32) | (u32)address;

	}

#endif

	return address;

block/bio.c

+2 −3
Original line number Diff line number Diff line
@@ -1596,7 +1596,6 @@ void bio_set_pages_dirty(struct bio *bio) 
	int i;



	bio_for_each_segment_all(bvec, bio, i) {

		if (!PageCompound(bvec->bv_page))

		set_page_dirty_lock(bvec->bv_page);

	}

}
@@ -1656,7 +1655,7 @@ void bio_check_pages_dirty(struct bio *bio) 
	int i;



	bio_for_each_segment_all(bvec, bio, i) {

		if (!PageDirty(bvec->bv_page) && !PageCompound(bvec->bv_page))

		if (!PageDirty(bvec->bv_page))

			goto defer;

	}

crypto/algapi.c

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg) 
		}



		if (!strcmp(q->cra_driver_name, alg->cra_name) ||

		    !strcmp(q->cra_driver_name, alg->cra_driver_name) ||

		    !strcmp(q->cra_name, alg->cra_driver_name))

			goto err;

	}

drivers/base/core.c

+42 −0
Original line number Diff line number Diff line
@@ -3779,6 +3779,48 @@ define_dev_printk_level(_dev_info, KERN_INFO); 


#endif



/**

 * dev_err_probe - probe error check and log helper

 * @dev: the pointer to the struct device

 * @err: error value to test

 * @fmt: printf-style format string

 * @...: arguments as specified in the format string

 *

 * This helper implements common pattern present in probe functions for error

 * checking: print debug or error message depending if the error value is

 * -EPROBE_DEFER and propagate error upwards.

 * It replaces code sequence:

 * 	if (err != -EPROBE_DEFER)

 * 		dev_err(dev, ...);

 * 	else

 * 		dev_dbg(dev, ...);

 * 	return err;

 * with

 * 	return dev_err_probe(dev, err, ...);

 *

 * Returns @err.

 *

 */

int dev_err_probe(const struct device *dev, int err, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);

	vaf.fmt = fmt;

	vaf.va = &args;



	if (err != -EPROBE_DEFER)

		dev_err(dev, "error %d: %pV", err, &vaf);

	else

		dev_dbg(dev, "error %d: %pV", err, &vaf);



	va_end(args);



	return err;

}

EXPORT_SYMBOL_GPL(dev_err_probe);



static inline bool fwnode_is_primary(struct fwnode_handle *fwnode)

{

	return fwnode && !IS_ERR(fwnode->secondary);

drivers/char/hw_random/core.c

+21 −13
Original line number Diff line number Diff line
@@ -24,10 +24,13 @@ 
#include <linux/random.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/uaccess.h>



#define RNG_MODULE_NAME		"hw_random"



#define RNG_BUFFER_SIZE (SMP_CACHE_BYTES < 32 ? 32 : SMP_CACHE_BYTES)



static struct hwrng *current_rng;

/* the current rng has been explicitly chosen by user via sysfs */

static int cur_rng_set_by_user;
@@ -59,7 +62,7 @@ static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size, 


static size_t rng_buffer_size(void)

{

	return SMP_CACHE_BYTES < 32 ? 32 : SMP_CACHE_BYTES;

	return RNG_BUFFER_SIZE;

}



static void add_early_randomness(struct hwrng *rng)
@@ -202,6 +205,7 @@ static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size, 
static ssize_t rng_dev_read(struct file *filp, char __user *buf,

			    size_t size, loff_t *offp)

{

	u8 buffer[RNG_BUFFER_SIZE];

	ssize_t ret = 0;

	int err = 0;

	int bytes_read, len;
@@ -229,34 +233,37 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf, 
			if (bytes_read < 0) {

				err = bytes_read;

				goto out_unlock_reading;

			} else if (bytes_read == 0 &&

				   (filp->f_flags & O_NONBLOCK)) {

				err = -EAGAIN;

				goto out_unlock_reading;

			}



			data_avail = bytes_read;

		}



		if (!data_avail) {

			if (filp->f_flags & O_NONBLOCK) {

				err = -EAGAIN;

				goto out_unlock_reading;

			}

		} else {

		len = data_avail;

		if (len) {

			if (len > size)

				len = size;



			data_avail -= len;



			if (copy_to_user(buf + ret, rng_buffer + data_avail,

								len)) {

			memcpy(buffer, rng_buffer + data_avail, len);

		}

		mutex_unlock(&reading_mutex);

		put_rng(rng);



		if (len) {

			if (copy_to_user(buf + ret, buffer, len)) {

				err = -EFAULT;

				goto out_unlock_reading;

				goto out;

			}



			size -= len;

			ret += len;

		}



		mutex_unlock(&reading_mutex);

		put_rng(rng);



		if (need_resched())

			schedule_timeout_interruptible(1);
@@ -267,6 +274,7 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf, 
		}

	}

out:

	memzero_explicit(buffer, sizeof(buffer));

	return ret ? : err;



out_unlock_reading: