diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 20:54:45 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 20:54:45 +0300 |
commit | 9875b201e05a8dfd107530853a0d021c8eea95d1 (patch) | |
tree | 29362628ba8f2687de232a06ecfd19f908300c67 /drivers/platform/chrome/chromeos_pstore.c | |
parent | 0486a39a6d6c8db78bde4d7b9c44e32dcc6050d4 (diff) | |
parent | bbb7ad49b8350b79261ce087c8e101d92f15533d (diff) | |
download | linux-9875b201e05a8dfd107530853a0d021c8eea95d1.tar.xz |
Merge tag 'tag-chrome-platform-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform updates from Benson Leung:
"cros_ec_typec:
- Add notifier for update, and register port partner
Sensors/iio:
- Fixes to cros_ec_sensorhub around allocation of resources, and
send_sample
Wilco EC:
- Fix to output format of h1_gpio
Misc:
- Misc fixes to appease kernel-doc and other warnings
- Set user space log size in chromeos_pstore"
* tag 'tag-chrome-platform-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
platform/chrome: cros_usbpd_logger: Add __printf annotation to append_str()
platform/chrome: cros_ec_i2c: Appease the kernel-doc deity
platform/chrome: typec: Fix ret value check error
platform/chrome: cros_ec_typec: Register port partner
platform/chrome: cros_ec_typec: Add struct for port data
platform/chrome: cros_ec_typec: Use notifier for updates
platform/chrome: cros_ec_ishtp: free ishtp buffer before sending event
platform/chrome: cros_ec_ishtp: skip old cros_ec responses
platform/chrome: wilco_ec: Provide correct output format to 'h1_gpio' file
platform/chrome: chromeos_pstore: set user space log size
Diffstat (limited to 'drivers/platform/chrome/chromeos_pstore.c')
-rw-r--r-- | drivers/platform/chrome/chromeos_pstore.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c index fa51153688b4..f37c0ef4af1f 100644 --- a/drivers/platform/chrome/chromeos_pstore.c +++ b/drivers/platform/chrome/chromeos_pstore.c @@ -57,6 +57,7 @@ static struct ramoops_platform_data chromeos_ramoops_data = { .record_size = 0x40000, .console_size = 0x20000, .ftrace_size = 0x20000, + .pmsg_size = 0x20000, .max_reason = KMSG_DUMP_OOPS, }; |