History

Merge branches 'pm-core', 'pm-sleep', 'pm-acpi' and 'pm-domains'

* pm-core: PM: runtime: Add pm_runtime_get_if_active() * pm-sleep: PM: sleep: wakeup: Skip wakeup_source_sysfs_remove() if device is not there PM / hibernate: Remove unnecessary compat ioctl overrides PM: hibernate: fix docs for ioctls that return loff_t via pointer PM: sleep: wakeup: Use built-in RCU list checking PM: sleep: core: Use built-in RCU list checking * pm-acpi: ACPI: PM: s2idle: Refine active GPEs check ACPICA: Allow acpi_any_gpe_status_set() to skip one GPE ACPI: PM: s2idle: Fix comment in acpi_s2idle_prepare_late() * pm-domains: cpuidle: psci: Split psci_dt_cpu_init_idle() PM / Domains: Allow no domain-idle-states DT property in genpd when parsing

Rafael J. Wysocki committed 6 years ago

Commit ada06295 parents 0411f0d c111566 87de659 d540628 7fbee4816 files · +166 −87Browse files

Showing the changes to kernel (1 of 16 files). Show all

Unified · Split

kernel/power/user.c+1−15
@@ -409,21 +409,7 @@ snapshot_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · 408 unmodified lines
409 switch (cmd) {409 switch (cmd) {
410 case SNAPSHOT_GET_IMAGE_SIZE:410 case SNAPSHOT_GET_IMAGE_SIZE:
411 case SNAPSHOT_AVAIL_SWAP_SIZE:411 case SNAPSHOT_AVAIL_SWAP_SIZE:
412 case SNAPSHOT_ALLOC_SWAP_PAGE: {412 case SNAPSHOT_ALLOC_SWAP_PAGE:
413 compat_loff_t __user *uoffset = compat_ptr(arg);
414 loff_t offset;
415 mm_segment_t old_fs;
416 int err;
417
418 old_fs = get_fs();
419 set_fs(KERNEL_DS);
420 err = snapshot_ioctl(file, cmd, (unsigned long) &offset);
421 set_fs(old_fs);
422 if (!err && put_user(offset, uoffset))
423 err = -EFAULT;
424 return err;
425 }
426
427 case SNAPSHOT_CREATE_IMAGE:413 case SNAPSHOT_CREATE_IMAGE:
428 return snapshot_ioctl(file, cmd,414 return snapshot_ioctl(file, cmd,
429 (unsigned long) compat_ptr(arg));415 (unsigned long) compat_ptr(arg));

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