diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-08 01:34:39 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-08 01:34:39 -0500 |
| commit | 91915260ea5ed9d9b19bfb75d53c989c8ada2ab0 (patch) | |
| tree | f7eb16ced65f39ebd0bb32e3b4e5e0f365755536 /include | |
| parent | 21136946c495b0e1e0f7e25a8de6f170efbdeadf (diff) | |
| parent | 07bf139b906013ecef0c5e0441564d1ae10e974a (diff) | |
Merge tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Bit a bit -fixes pull request in the merge window than usual dua to two
feauture-y things:
- Display CRCs are now enabled on all platforms, including the odd DP case
on gm45/vlv. Since this is a testing-only feature it should ever hurt,
but I figured it'll help with regression-testing -fixes. So I left it
in and didn't postpone it to 3.14.
- Display power well refactoring from Imre. Would have caused major pain
conflict with the bdw stage 1 patches if I'd postpone this to -next.
It's only an relatively small interface rework, so shouldn't cause pain.
It's also been in my tree since almost 3 weeks already.
That accounts for about two thirds of the pull, otherwise just bugfixes:
- vlv backlight fix from Jesse/Jani
- vlv vblank timestamp fix from Jesse
- improved edp detection through vbt from Ville (fixes a vlv issue)
- eDP vdd fix from Paulo
- fixes for dvo lvds on i830M
- a few smaller things all over
Note: This contains a backmerge of v3.12. Since the -internal branch
always applied on top of -nightly I need that unified base to merge bdw
patches. So you'll get a conflict with radeon connector props when pulling
this (and nouveau/master will also conflict a bit when Ben doesn't
rebase). The backmerge itself only had conflicts in drm/i915.
There's also a tiny conflict between Jani's backlight fix and your sysfs
lifetime fix in drm-next.
* tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel: (940 commits)
drm/i915/vlv: use per-pipe backlight controls v2
drm/i915: make backlight functions take a connector
drm/i915: move opregion asle request handling to a work queue
drm/i915/vlv: use PIPE_START_VBLANK interrupts on VLV
drm/i915: Make intel_dp_is_edp() less specific
drm/i915: Give names to the VBT child device type bits
drm/i915/vlv: enable HDA display audio for Valleyview2
drm/i915/dvo: call ->mode_set callback only when the port is running
drm/i915: avoid unclaimed registers when capturing the error state
drm/i915: Enable DP port CRC for the "auto" source on g4x/vlv
drm/i915: scramble reset support for DP port CRC on vlv
drm/i915: scramble reset support for DP port CRC on g4x
drm/i916: add "auto" pipe CRC source
...
Conflicts:
MAINTAINERS
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/nouveau/core/subdev/mc/base.c
drivers/gpu/drm/radeon/atombios_encoders.c
drivers/gpu/drm/radeon/radeon_connectors.c
Diffstat (limited to 'include')
49 files changed, 203 insertions, 129 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 02e113bb8b7d..d9019821aa60 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -311,7 +311,6 @@ struct acpi_device { | |||
| 311 | unsigned int physical_node_count; | 311 | unsigned int physical_node_count; |
| 312 | struct list_head physical_node_list; | 312 | struct list_head physical_node_list; |
| 313 | struct mutex physical_node_lock; | 313 | struct mutex physical_node_lock; |
| 314 | struct list_head power_dependent; | ||
| 315 | void (*remove)(struct acpi_device *); | 314 | void (*remove)(struct acpi_device *); |
| 316 | }; | 315 | }; |
| 317 | 316 | ||
| @@ -456,8 +455,6 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev, | |||
| 456 | acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, | 455 | acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, |
| 457 | acpi_notify_handler handler); | 456 | acpi_notify_handler handler); |
| 458 | int acpi_pm_device_sleep_state(struct device *, int *, int); | 457 | int acpi_pm_device_sleep_state(struct device *, int *, int); |
| 459 | void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev); | ||
| 460 | void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev); | ||
| 461 | #else | 458 | #else |
| 462 | static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, | 459 | static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, |
| 463 | acpi_notify_handler handler, | 460 | acpi_notify_handler handler, |
| @@ -478,10 +475,6 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) | |||
| 478 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? | 475 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? |
| 479 | m : ACPI_STATE_D0; | 476 | m : ACPI_STATE_D0; |
| 480 | } | 477 | } |
| 481 | static inline void acpi_dev_pm_add_dependent(acpi_handle handle, | ||
| 482 | struct device *depdev) {} | ||
| 483 | static inline void acpi_dev_pm_remove_dependent(acpi_handle handle, | ||
| 484 | struct device *depdev) {} | ||
| 485 | #endif | 478 | #endif |
| 486 | 479 | ||
| 487 | #ifdef CONFIG_PM_RUNTIME | 480 | #ifdef CONFIG_PM_RUNTIME |
diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index d06079c774a0..99b490b4d05a 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h | |||
| @@ -6,12 +6,12 @@ static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot) | |||
| 6 | return mk_pte(page, pgprot); | 6 | return mk_pte(page, pgprot); |
| 7 | } | 7 | } |
| 8 | 8 | ||
| 9 | static inline int huge_pte_write(pte_t pte) | 9 | static inline unsigned long huge_pte_write(pte_t pte) |
| 10 | { | 10 | { |
| 11 | return pte_write(pte); | 11 | return pte_write(pte); |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | static inline int huge_pte_dirty(pte_t pte) | 14 | static inline unsigned long huge_pte_dirty(pte_t pte) |
| 15 | { | 15 | { |
| 16 | return pte_dirty(pte); | 16 | return pte_dirty(pte); |
| 17 | } | 17 | } |
diff --git a/include/asm-generic/vtime.h b/include/asm-generic/vtime.h index e69de29bb2d1..b1a49677fe25 100644 --- a/include/asm-generic/vtime.h +++ b/include/asm-generic/vtime.h | |||
| @@ -0,0 +1 @@ | |||
| /* no content, but patch(1) dislikes empty files */ | |||
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index edbd250809cb..bed35e36fd27 100644 --- a/include/dt-bindings/pinctrl/omap.h +++ b/include/dt-bindings/pinctrl/omap.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #define PULL_UP (1 << 4) | 23 | #define PULL_UP (1 << 4) |
| 24 | #define ALTELECTRICALSEL (1 << 5) | 24 | #define ALTELECTRICALSEL (1 << 5) |
| 25 | 25 | ||
| 26 | /* 34xx specific mux bit defines */ | 26 | /* omap3/4/5 specific mux bit defines */ |
| 27 | #define INPUT_EN (1 << 8) | 27 | #define INPUT_EN (1 << 8) |
| 28 | #define OFF_EN (1 << 9) | 28 | #define OFF_EN (1 << 9) |
| 29 | #define OFFOUT_EN (1 << 10) | 29 | #define OFFOUT_EN (1 << 10) |
| @@ -31,8 +31,6 @@ | |||
| 31 | #define OFF_PULL_EN (1 << 12) | 31 | #define OFF_PULL_EN (1 << 12) |
| 32 | #define OFF_PULL_UP (1 << 13) | 32 | #define OFF_PULL_UP (1 << 13) |
| 33 | #define WAKEUP_EN (1 << 14) | 33 | #define WAKEUP_EN (1 << 14) |
| 34 | |||
| 35 | /* 44xx specific mux bit defines */ | ||
| 36 | #define WAKEUP_EVENT (1 << 15) | 34 | #define WAKEUP_EVENT (1 << 15) |
| 37 | 35 | ||
| 38 | /* Active pin states */ | 36 | /* Active pin states */ |
diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index f7f1d7169b11..089743ade734 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h | |||
| @@ -159,6 +159,26 @@ static inline bool balloon_page_movable(struct page *page) | |||
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | /* | 161 | /* |
| 162 | * isolated_balloon_page - identify an isolated balloon page on private | ||
| 163 | * compaction/migration page lists. | ||
| 164 | * | ||
| 165 | * After a compaction thread isolates a balloon page for migration, it raises | ||
| 166 | * the page refcount to prevent concurrent compaction threads from re-isolating | ||
| 167 | * the same page. For that reason putback_movable_pages(), or other routines | ||
| 168 | * that need to identify isolated balloon pages on private pagelists, cannot | ||
| 169 | * rely on balloon_page_movable() to accomplish the task. | ||
| 170 | */ | ||
| 171 | static inline bool isolated_balloon_page(struct page *page) | ||
| 172 | { | ||
| 173 | /* Already isolated balloon pages, by default, have a raised refcount */ | ||
| 174 | if (page_flags_cleared(page) && !page_mapped(page) && | ||
| 175 | page_count(page) >= 2) | ||
| 176 | return __is_movable_balloon_page(page); | ||
| 177 | |||
| 178 | return false; | ||
| 179 | } | ||
| 180 | |||
| 181 | /* | ||
| 162 | * balloon_page_insert - insert a page into the balloon's page list and make | 182 | * balloon_page_insert - insert a page into the balloon's page list and make |
| 163 | * the page->mapping assignment accordingly. | 183 | * the page->mapping assignment accordingly. |
| 164 | * @page : page to be assigned as a 'balloon page' | 184 | * @page : page to be assigned as a 'balloon page' |
| @@ -243,6 +263,11 @@ static inline bool balloon_page_movable(struct page *page) | |||
| 243 | return false; | 263 | return false; |
| 244 | } | 264 | } |
| 245 | 265 | ||
| 266 | static inline bool isolated_balloon_page(struct page *page) | ||
| 267 | { | ||
| 268 | return false; | ||
| 269 | } | ||
| 270 | |||
| 246 | static inline bool balloon_page_isolate(struct page *page) | 271 | static inline bool balloon_page_isolate(struct page *page) |
| 247 | { | 272 | { |
| 248 | return false; | 273 | return false; |
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h index d66033f418c9..0333e605ea0d 100644 --- a/include/linux/bcma/bcma_driver_pci.h +++ b/include/linux/bcma/bcma_driver_pci.h | |||
| @@ -242,6 +242,7 @@ extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, | |||
| 242 | struct bcma_device *core, bool enable); | 242 | struct bcma_device *core, bool enable); |
| 243 | extern void bcma_core_pci_up(struct bcma_bus *bus); | 243 | extern void bcma_core_pci_up(struct bcma_bus *bus); |
| 244 | extern void bcma_core_pci_down(struct bcma_bus *bus); | 244 | extern void bcma_core_pci_down(struct bcma_bus *bus); |
| 245 | extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up); | ||
| 245 | 246 | ||
| 246 | extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev); | 247 | extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev); |
| 247 | extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev); | 248 | extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev); |
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 842de225055f..ded429966c1f 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
| @@ -65,6 +65,21 @@ | |||
| 65 | #define __visible __attribute__((externally_visible)) | 65 | #define __visible __attribute__((externally_visible)) |
| 66 | #endif | 66 | #endif |
| 67 | 67 | ||
| 68 | /* | ||
| 69 | * GCC 'asm goto' miscompiles certain code sequences: | ||
| 70 | * | ||
| 71 | * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 | ||
| 72 | * | ||
| 73 | * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. | ||
| 74 | * Fixed in GCC 4.8.2 and later versions. | ||
| 75 | * | ||
| 76 | * (asm goto is automatically volatile - the naming reflects this.) | ||
| 77 | */ | ||
| 78 | #if GCC_VERSION <= 40801 | ||
| 79 | # define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) | ||
| 80 | #else | ||
| 81 | # define asm_volatile_goto(x...) do { asm goto(x); } while (0) | ||
| 82 | #endif | ||
| 68 | 83 | ||
| 69 | #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP | 84 | #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP |
| 70 | #if GCC_VERSION >= 40400 | 85 | #if GCC_VERSION >= 40400 |
diff --git a/include/linux/filter.h b/include/linux/filter.h index a6ac84871d6d..ff4e40cd45b1 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/atomic.h> | 7 | #include <linux/atomic.h> |
| 8 | #include <linux/compat.h> | 8 | #include <linux/compat.h> |
| 9 | #include <linux/workqueue.h> | ||
| 9 | #include <uapi/linux/filter.h> | 10 | #include <uapi/linux/filter.h> |
| 10 | 11 | ||
| 11 | #ifdef CONFIG_COMPAT | 12 | #ifdef CONFIG_COMPAT |
| @@ -25,15 +26,19 @@ struct sk_filter | |||
| 25 | { | 26 | { |
| 26 | atomic_t refcnt; | 27 | atomic_t refcnt; |
| 27 | unsigned int len; /* Number of filter blocks */ | 28 | unsigned int len; /* Number of filter blocks */ |
| 29 | struct rcu_head rcu; | ||
| 28 | unsigned int (*bpf_func)(const struct sk_buff *skb, | 30 | unsigned int (*bpf_func)(const struct sk_buff *skb, |
| 29 | const struct sock_filter *filter); | 31 | const struct sock_filter *filter); |
| 30 | struct rcu_head rcu; | 32 | union { |
| 31 | struct sock_filter insns[0]; | 33 | struct sock_filter insns[0]; |
| 34 | struct work_struct work; | ||
| 35 | }; | ||
| 32 | }; | 36 | }; |
| 33 | 37 | ||
| 34 | static inline unsigned int sk_filter_len(const struct sk_filter *fp) | 38 | static inline unsigned int sk_filter_size(unsigned int proglen) |
| 35 | { | 39 | { |
| 36 | return fp->len * sizeof(struct sock_filter) + sizeof(*fp); | 40 | return max(sizeof(struct sk_filter), |
| 41 | offsetof(struct sk_filter, insns[proglen])); | ||
| 37 | } | 42 | } |
| 38 | 43 | ||
| 39 | extern int sk_filter(struct sock *sk, struct sk_buff *skb); | 44 | extern int sk_filter(struct sock *sk, struct sk_buff *skb); |
| @@ -67,11 +72,13 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen, | |||
| 67 | } | 72 | } |
| 68 | #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) | 73 | #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) |
| 69 | #else | 74 | #else |
| 75 | #include <linux/slab.h> | ||
| 70 | static inline void bpf_jit_compile(struct sk_filter *fp) | 76 | static inline void bpf_jit_compile(struct sk_filter *fp) |
| 71 | { | 77 | { |
| 72 | } | 78 | } |
| 73 | static inline void bpf_jit_free(struct sk_filter *fp) | 79 | static inline void bpf_jit_free(struct sk_filter *fp) |
| 74 | { | 80 | { |
| 81 | kfree(fp); | ||
| 75 | } | 82 | } |
| 76 | #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) | 83 | #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) |
| 77 | #endif | 84 | #endif |
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 78e2ada50cd5..d380c5e68008 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | #define DMAR_IQT_REG 0x88 /* Invalidation queue tail register */ | 55 | #define DMAR_IQT_REG 0x88 /* Invalidation queue tail register */ |
| 56 | #define DMAR_IQ_SHIFT 4 /* Invalidation queue head/tail shift */ | 56 | #define DMAR_IQ_SHIFT 4 /* Invalidation queue head/tail shift */ |
| 57 | #define DMAR_IQA_REG 0x90 /* Invalidation queue addr register */ | 57 | #define DMAR_IQA_REG 0x90 /* Invalidation queue addr register */ |
| 58 | #define DMAR_ICS_REG 0x98 /* Invalidation complete status register */ | 58 | #define DMAR_ICS_REG 0x9c /* Invalidation complete status register */ |
| 59 | #define DMAR_IRTA_REG 0xb8 /* Interrupt remapping table addr register */ | 59 | #define DMAR_IRTA_REG 0xb8 /* Interrupt remapping table addr register */ |
| 60 | 60 | ||
| 61 | #define OFFSET_STRIDE (9) | 61 | #define OFFSET_STRIDE (9) |
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 19c19a5eee29..f6c82de12541 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
| @@ -34,9 +34,9 @@ struct ipc_namespace { | |||
| 34 | int sem_ctls[4]; | 34 | int sem_ctls[4]; |
| 35 | int used_sems; | 35 | int used_sems; |
| 36 | 36 | ||
| 37 | int msg_ctlmax; | 37 | unsigned int msg_ctlmax; |
| 38 | int msg_ctlmnb; | 38 | unsigned int msg_ctlmnb; |
| 39 | int msg_ctlmni; | 39 | unsigned int msg_ctlmni; |
| 40 | atomic_t msg_bytes; | 40 | atomic_t msg_bytes; |
| 41 | atomic_t msg_hdrs; | 41 | atomic_t msg_hdrs; |
| 42 | int auto_msgmni; | 42 | int auto_msgmni; |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 482ad2d84a32..672ddc4de4af 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -439,6 +439,17 @@ static inline char *hex_byte_pack(char *buf, u8 byte) | |||
| 439 | return buf; | 439 | return buf; |
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | extern const char hex_asc_upper[]; | ||
| 443 | #define hex_asc_upper_lo(x) hex_asc_upper[((x) & 0x0f)] | ||
| 444 | #define hex_asc_upper_hi(x) hex_asc_upper[((x) & 0xf0) >> 4] | ||
| 445 | |||
| 446 | static inline char *hex_byte_pack_upper(char *buf, u8 byte) | ||
| 447 | { | ||
| 448 | *buf++ = hex_asc_upper_hi(byte); | ||
| 449 | *buf++ = hex_asc_upper_lo(byte); | ||
| 450 | return buf; | ||
| 451 | } | ||
| 452 | |||
| 442 | static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) | 453 | static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) |
| 443 | { | 454 | { |
| 444 | return hex_byte_pack(buf, byte); | 455 | return hex_byte_pack(buf, byte); |
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ecc82b37c4cc..b3e7a667e03c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
| @@ -137,47 +137,24 @@ extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, | |||
| 137 | extern void mem_cgroup_replace_page_cache(struct page *oldpage, | 137 | extern void mem_cgroup_replace_page_cache(struct page *oldpage, |
| 138 | struct page *newpage); | 138 | struct page *newpage); |
| 139 | 139 | ||
| 140 | /** | 140 | static inline void mem_cgroup_oom_enable(void) |
| 141 | * mem_cgroup_toggle_oom - toggle the memcg OOM killer for the current task | ||
| 142 | * @new: true to enable, false to disable | ||
| 143 | * | ||
| 144 | * Toggle whether a failed memcg charge should invoke the OOM killer | ||
| 145 | * or just return -ENOMEM. Returns the previous toggle state. | ||
| 146 | * | ||
| 147 | * NOTE: Any path that enables the OOM killer before charging must | ||
| 148 | * call mem_cgroup_oom_synchronize() afterward to finalize the | ||
| 149 | * OOM handling and clean up. | ||
| 150 | */ | ||
| 151 | static inline bool mem_cgroup_toggle_oom(bool new) | ||
| 152 | { | 141 | { |
| 153 | bool old; | 142 | WARN_ON(current->memcg_oom.may_oom); |
| 154 | 143 | current->memcg_oom.may_oom = 1; | |
| 155 | old = current->memcg_oom.may_oom; | ||
| 156 | current->memcg_oom.may_oom = new; | ||
| 157 | |||
| 158 | return old; | ||
| 159 | } | 144 | } |
| 160 | 145 | ||
| 161 | static inline void mem_cgroup_enable_oom(void) | 146 | static inline void mem_cgroup_oom_disable(void) |
| 162 | { | 147 | { |
| 163 | bool old = mem_cgroup_toggle_oom(true); | 148 | WARN_ON(!current->memcg_oom.may_oom); |
| 164 | 149 | current->memcg_oom.may_oom = 0; | |
| 165 | WARN_ON(old == true); | ||
| 166 | } | ||
| 167 | |||
| 168 | static inline void mem_cgroup_disable_oom(void) | ||
| 169 | { | ||
| 170 | bool old = mem_cgroup_toggle_oom(false); | ||
| 171 | |||
| 172 | WARN_ON(old == false); | ||
| 173 | } | 150 | } |
| 174 | 151 | ||
| 175 | static inline bool task_in_memcg_oom(struct task_struct *p) | 152 | static inline bool task_in_memcg_oom(struct task_struct *p) |
| 176 | { | 153 | { |
| 177 | return p->memcg_oom.in_memcg_oom; | 154 | return p->memcg_oom.memcg; |
| 178 | } | 155 | } |
| 179 | 156 | ||
| 180 | bool mem_cgroup_oom_synchronize(void); | 157 | bool mem_cgroup_oom_synchronize(bool wait); |
| 181 | 158 | ||
| 182 | #ifdef CONFIG_MEMCG_SWAP | 159 | #ifdef CONFIG_MEMCG_SWAP |
| 183 | extern int do_swap_account; | 160 | extern int do_swap_account; |
| @@ -402,16 +379,11 @@ static inline void mem_cgroup_end_update_page_stat(struct page *page, | |||
| 402 | { | 379 | { |
| 403 | } | 380 | } |
| 404 | 381 | ||
| 405 | static inline bool mem_cgroup_toggle_oom(bool new) | 382 | static inline void mem_cgroup_oom_enable(void) |
| 406 | { | ||
| 407 | return false; | ||
| 408 | } | ||
| 409 | |||
| 410 | static inline void mem_cgroup_enable_oom(void) | ||
| 411 | { | 383 | { |
| 412 | } | 384 | } |
| 413 | 385 | ||
| 414 | static inline void mem_cgroup_disable_oom(void) | 386 | static inline void mem_cgroup_oom_disable(void) |
| 415 | { | 387 | { |
| 416 | } | 388 | } |
| 417 | 389 | ||
| @@ -420,7 +392,7 @@ static inline bool task_in_memcg_oom(struct task_struct *p) | |||
| 420 | return false; | 392 | return false; |
| 421 | } | 393 | } |
| 422 | 394 | ||
| 423 | static inline bool mem_cgroup_oom_synchronize(void) | 395 | static inline bool mem_cgroup_oom_synchronize(bool wait) |
| 424 | { | 396 | { |
| 425 | return false; | 397 | return false; |
| 426 | } | 398 | } |
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 09c2300ddb37..cb358355ef43 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #define MAPPER_CTRL_MINOR 236 | 45 | #define MAPPER_CTRL_MINOR 236 |
| 46 | #define LOOP_CTRL_MINOR 237 | 46 | #define LOOP_CTRL_MINOR 237 |
| 47 | #define VHOST_NET_MINOR 238 | 47 | #define VHOST_NET_MINOR 238 |
| 48 | #define UHID_MINOR 239 | ||
| 48 | #define MISC_DYNAMIC_MINOR 255 | 49 | #define MISC_DYNAMIC_MINOR 255 |
| 49 | 50 | ||
| 50 | struct device; | 51 | struct device; |
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 68029b30c3dc..5eb4e31af22b 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h | |||
| @@ -181,7 +181,7 @@ enum { | |||
| 181 | MLX5_DEV_CAP_FLAG_TLP_HINTS = 1LL << 39, | 181 | MLX5_DEV_CAP_FLAG_TLP_HINTS = 1LL << 39, |
| 182 | MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40, | 182 | MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40, |
| 183 | MLX5_DEV_CAP_FLAG_DCT = 1LL << 41, | 183 | MLX5_DEV_CAP_FLAG_DCT = 1LL << 41, |
| 184 | MLX5_DEV_CAP_FLAG_CMDIF_CSUM = 1LL << 46, | 184 | MLX5_DEV_CAP_FLAG_CMDIF_CSUM = 3LL << 46, |
| 185 | }; | 185 | }; |
| 186 | 186 | ||
| 187 | enum { | 187 | enum { |
| @@ -417,7 +417,7 @@ struct mlx5_init_seg { | |||
| 417 | struct health_buffer health; | 417 | struct health_buffer health; |
| 418 | __be32 rsvd2[884]; | 418 | __be32 rsvd2[884]; |
| 419 | __be32 health_counter; | 419 | __be32 health_counter; |
| 420 | __be32 rsvd3[1023]; | 420 | __be32 rsvd3[1019]; |
| 421 | __be64 ieee1588_clk; | 421 | __be64 ieee1588_clk; |
| 422 | __be32 ieee1588_clk_type; | 422 | __be32 ieee1588_clk_type; |
| 423 | __be32 clr_intx; | 423 | __be32 clr_intx; |
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 8888381fc150..6b8c496572c8 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h | |||
| @@ -82,7 +82,7 @@ enum { | |||
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | enum { | 84 | enum { |
| 85 | MLX5_MAX_EQ_NAME = 20 | 85 | MLX5_MAX_EQ_NAME = 32 |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | enum { | 88 | enum { |
| @@ -747,8 +747,7 @@ static inline u32 mlx5_idx_to_mkey(u32 mkey_idx) | |||
| 747 | 747 | ||
| 748 | enum { | 748 | enum { |
| 749 | MLX5_PROF_MASK_QP_SIZE = (u64)1 << 0, | 749 | MLX5_PROF_MASK_QP_SIZE = (u64)1 << 0, |
| 750 | MLX5_PROF_MASK_CMDIF_CSUM = (u64)1 << 1, | 750 | MLX5_PROF_MASK_MR_CACHE = (u64)1 << 1, |
| 751 | MLX5_PROF_MASK_MR_CACHE = (u64)1 << 2, | ||
| 752 | }; | 751 | }; |
| 753 | 752 | ||
| 754 | enum { | 753 | enum { |
| @@ -758,7 +757,6 @@ enum { | |||
| 758 | struct mlx5_profile { | 757 | struct mlx5_profile { |
| 759 | u64 mask; | 758 | u64 mask; |
| 760 | u32 log_max_qp; | 759 | u32 log_max_qp; |
| 761 | int cmdif_csum; | ||
| 762 | struct { | 760 | struct { |
| 763 | int size; | 761 | int size; |
| 764 | int limit; | 762 | int limit; |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3de49aca4519..25f5d2d11e7c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2264,11 +2264,12 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index) | |||
| 2264 | } | 2264 | } |
| 2265 | 2265 | ||
| 2266 | #ifdef CONFIG_XPS | 2266 | #ifdef CONFIG_XPS |
| 2267 | extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, | 2267 | extern int netif_set_xps_queue(struct net_device *dev, |
| 2268 | const struct cpumask *mask, | ||
| 2268 | u16 index); | 2269 | u16 index); |
| 2269 | #else | 2270 | #else |
| 2270 | static inline int netif_set_xps_queue(struct net_device *dev, | 2271 | static inline int netif_set_xps_queue(struct net_device *dev, |
| 2271 | struct cpumask *mask, | 2272 | const struct cpumask *mask, |
| 2272 | u16 index) | 2273 | u16 index) |
| 2273 | { | 2274 | { |
| 2274 | return 0; | 2275 | return 0; |
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 01fd84b566f7..49f52c8f4422 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
| @@ -1455,7 +1455,8 @@ struct nfs_rpc_ops { | |||
| 1455 | struct inode * (*open_context) (struct inode *dir, | 1455 | struct inode * (*open_context) (struct inode *dir, |
| 1456 | struct nfs_open_context *ctx, | 1456 | struct nfs_open_context *ctx, |
| 1457 | int open_flags, | 1457 | int open_flags, |
| 1458 | struct iattr *iattr); | 1458 | struct iattr *iattr, |
| 1459 | int *); | ||
| 1459 | int (*have_delegation)(struct inode *, fmode_t); | 1460 | int (*have_delegation)(struct inode *, fmode_t); |
| 1460 | int (*return_delegation)(struct inode *); | 1461 | int (*return_delegation)(struct inode *); |
| 1461 | struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *); | 1462 | struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *); |
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h deleted file mode 100644 index c84128255814..000000000000 --- a/include/linux/of_reserved_mem.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifndef __OF_RESERVED_MEM_H | ||
| 2 | #define __OF_RESERVED_MEM_H | ||
| 3 | |||
| 4 | #ifdef CONFIG_OF_RESERVED_MEM | ||
| 5 | void of_reserved_mem_device_init(struct device *dev); | ||
| 6 | void of_reserved_mem_device_release(struct device *dev); | ||
| 7 | void early_init_dt_scan_reserved_mem(void); | ||
| 8 | #else | ||
| 9 | static inline void of_reserved_mem_device_init(struct device *dev) { } | ||
| 10 | static inline void of_reserved_mem_device_release(struct device *dev) { } | ||
| 11 | static inline void early_init_dt_scan_reserved_mem(void) { } | ||
| 12 | #endif | ||
| 13 | |||
| 14 | #endif /* __OF_RESERVED_MEM_H */ | ||
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index cc88172c7d9a..c74088ab103b 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -332,7 +332,7 @@ do { \ | |||
| 332 | #endif | 332 | #endif |
| 333 | 333 | ||
| 334 | #ifndef this_cpu_sub | 334 | #ifndef this_cpu_sub |
| 335 | # define this_cpu_sub(pcp, val) this_cpu_add((pcp), -(val)) | 335 | # define this_cpu_sub(pcp, val) this_cpu_add((pcp), -(typeof(pcp))(val)) |
| 336 | #endif | 336 | #endif |
| 337 | 337 | ||
| 338 | #ifndef this_cpu_inc | 338 | #ifndef this_cpu_inc |
| @@ -418,7 +418,7 @@ do { \ | |||
| 418 | # define this_cpu_add_return(pcp, val) __pcpu_size_call_return2(this_cpu_add_return_, pcp, val) | 418 | # define this_cpu_add_return(pcp, val) __pcpu_size_call_return2(this_cpu_add_return_, pcp, val) |
| 419 | #endif | 419 | #endif |
| 420 | 420 | ||
| 421 | #define this_cpu_sub_return(pcp, val) this_cpu_add_return(pcp, -(val)) | 421 | #define this_cpu_sub_return(pcp, val) this_cpu_add_return(pcp, -(typeof(pcp))(val)) |
| 422 | #define this_cpu_inc_return(pcp) this_cpu_add_return(pcp, 1) | 422 | #define this_cpu_inc_return(pcp) this_cpu_add_return(pcp, 1) |
| 423 | #define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1) | 423 | #define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1) |
| 424 | 424 | ||
| @@ -586,7 +586,7 @@ do { \ | |||
| 586 | #endif | 586 | #endif |
| 587 | 587 | ||
| 588 | #ifndef __this_cpu_sub | 588 | #ifndef __this_cpu_sub |
| 589 | # define __this_cpu_sub(pcp, val) __this_cpu_add((pcp), -(val)) | 589 | # define __this_cpu_sub(pcp, val) __this_cpu_add((pcp), -(typeof(pcp))(val)) |
| 590 | #endif | 590 | #endif |
| 591 | 591 | ||
| 592 | #ifndef __this_cpu_inc | 592 | #ifndef __this_cpu_inc |
| @@ -668,7 +668,7 @@ do { \ | |||
| 668 | __pcpu_size_call_return2(__this_cpu_add_return_, pcp, val) | 668 | __pcpu_size_call_return2(__this_cpu_add_return_, pcp, val) |
| 669 | #endif | 669 | #endif |
| 670 | 670 | ||
| 671 | #define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(val)) | 671 | #define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(typeof(pcp))(val)) |
| 672 | #define __this_cpu_inc_return(pcp) __this_cpu_add_return(pcp, 1) | 672 | #define __this_cpu_inc_return(pcp) __this_cpu_add_return(pcp, 1) |
| 673 | #define __this_cpu_dec_return(pcp) __this_cpu_add_return(pcp, -1) | 673 | #define __this_cpu_dec_return(pcp) __this_cpu_add_return(pcp, -1) |
| 674 | 674 | ||
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 866e85c5eb94..c8ba627c1d60 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -294,9 +294,31 @@ struct ring_buffer; | |||
| 294 | */ | 294 | */ |
| 295 | struct perf_event { | 295 | struct perf_event { |
| 296 | #ifdef CONFIG_PERF_EVENTS | 296 | #ifdef CONFIG_PERF_EVENTS |
| 297 | struct list_head group_entry; | 297 | /* |
| 298 | * entry onto perf_event_context::event_list; | ||
| 299 | * modifications require ctx->lock | ||
| 300 | * RCU safe iterations. | ||
| 301 | */ | ||
| 298 | struct list_head event_entry; | 302 | struct list_head event_entry; |
| 303 | |||
| 304 | /* | ||
| 305 | * XXX: group_entry and sibling_list should be mutually exclusive; | ||
| 306 | * either you're a sibling on a group, or you're the group leader. | ||
| 307 | * Rework the code to always use the same list element. | ||
| 308 | * | ||
| 309 | * Locked for modification by both ctx->mutex and ctx->lock; holding | ||
| 310 | * either sufficies for read. | ||
| 311 | */ | ||
| 312 | struct list_head group_entry; | ||
| 299 | struct list_head sibling_list; | 313 | struct list_head sibling_list; |
| 314 | |||
| 315 | /* | ||
| 316 | * We need storage to track the entries in perf_pmu_migrate_context; we | ||
| 317 | * cannot use the event_entry because of RCU and we want to keep the | ||
| 318 | * group in tact which avoids us using the other two entries. | ||
| 319 | */ | ||
| 320 | struct list_head migrate_entry; | ||
| 321 | |||
| 300 | struct hlist_node hlist_entry; | 322 | struct hlist_node hlist_entry; |
| 301 | int nr_siblings; | 323 | int nr_siblings; |
| 302 | int group_flags; | 324 | int group_flags; |
diff --git a/include/linux/random.h b/include/linux/random.h index 3b9377d6b7a5..6312dd9ba449 100644 --- a/include/linux/random.h +++ b/include/linux/random.h | |||
| @@ -17,6 +17,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags); | |||
| 17 | extern void get_random_bytes(void *buf, int nbytes); | 17 | extern void get_random_bytes(void *buf, int nbytes); |
| 18 | extern void get_random_bytes_arch(void *buf, int nbytes); | 18 | extern void get_random_bytes_arch(void *buf, int nbytes); |
| 19 | void generate_random_uuid(unsigned char uuid_out[16]); | 19 | void generate_random_uuid(unsigned char uuid_out[16]); |
| 20 | extern int random_int_secret_init(void); | ||
| 20 | 21 | ||
| 21 | #ifndef MODULE | 22 | #ifndef MODULE |
| 22 | extern const struct file_operations random_fops, urandom_fops; | 23 | extern const struct file_operations random_fops, urandom_fops; |
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 67e13aa5a478..9bdad43ad228 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
| @@ -40,6 +40,8 @@ enum regulator_status { | |||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | /** | 42 | /** |
| 43 | * struct regulator_linear_range - specify linear voltage ranges | ||
| 44 | * | ||
| 43 | * Specify a range of voltages for regulator_map_linar_range() and | 45 | * Specify a range of voltages for regulator_map_linar_range() and |
| 44 | * regulator_list_linear_range(). | 46 | * regulator_list_linear_range(). |
| 45 | * | 47 | * |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 6682da36b293..e27baeeda3f4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1394,11 +1394,10 @@ struct task_struct { | |||
| 1394 | } memcg_batch; | 1394 | } memcg_batch; |
| 1395 | unsigned int memcg_kmem_skip_account; | 1395 | unsigned int memcg_kmem_skip_account; |
| 1396 | struct memcg_oom_info { | 1396 | struct memcg_oom_info { |
| 1397 | struct mem_cgroup *memcg; | ||
| 1398 | gfp_t gfp_mask; | ||
| 1399 | int order; | ||
| 1397 | unsigned int may_oom:1; | 1400 | unsigned int may_oom:1; |
| 1398 | unsigned int in_memcg_oom:1; | ||
| 1399 | unsigned int oom_locked:1; | ||
| 1400 | int wakeups; | ||
| 1401 | struct mem_cgroup *wait_on_memcg; | ||
| 1402 | } memcg_oom; | 1401 | } memcg_oom; |
| 1403 | #endif | 1402 | #endif |
| 1404 | #ifdef CONFIG_UPROBES | 1403 | #ifdef CONFIG_UPROBES |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 2ddb48d9312c..c2d89335f637 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -498,7 +498,7 @@ struct sk_buff { | |||
| 498 | * headers if needed | 498 | * headers if needed |
| 499 | */ | 499 | */ |
| 500 | __u8 encapsulation:1; | 500 | __u8 encapsulation:1; |
| 501 | /* 7/9 bit hole (depending on ndisc_nodetype presence) */ | 501 | /* 6/8 bit hole (depending on ndisc_nodetype presence) */ |
| 502 | kmemcheck_bitfield_end(flags2); | 502 | kmemcheck_bitfield_end(flags2); |
| 503 | 503 | ||
| 504 | #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL | 504 | #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL |
diff --git a/include/linux/timex.h b/include/linux/timex.h index dd3edd7dfc94..9d3f1a5b6178 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
| @@ -64,6 +64,20 @@ | |||
| 64 | 64 | ||
| 65 | #include <asm/timex.h> | 65 | #include <asm/timex.h> |
| 66 | 66 | ||
| 67 | #ifndef random_get_entropy | ||
| 68 | /* | ||
| 69 | * The random_get_entropy() function is used by the /dev/random driver | ||
| 70 | * in order to extract entropy via the relative unpredictability of | ||
| 71 | * when an interrupt takes places versus a high speed, fine-grained | ||
| 72 | * timing source or cycle counter. Since it will be occurred on every | ||
| 73 | * single interrupt, it must have a very low cost/overhead. | ||
| 74 | * | ||
| 75 | * By default we use get_cycles() for this purpose, but individual | ||
| 76 | * architectures may override this in their asm/timex.h header file. | ||
| 77 | */ | ||
| 78 | #define random_get_entropy() get_cycles() | ||
| 79 | #endif | ||
| 80 | |||
| 67 | /* | 81 | /* |
| 68 | * SHIFT_PLL is used as a dampening factor to define how much we | 82 | * SHIFT_PLL is used as a dampening factor to define how much we |
| 69 | * adjust the frequency correction for a given offset in PLL mode. | 83 | * adjust the frequency correction for a given offset in PLL mode. |
diff --git a/include/linux/usb/usb_phy_gen_xceiv.h b/include/linux/usb/usb_phy_gen_xceiv.h index f9a7e7bc925b..11d85b9c1b08 100644 --- a/include/linux/usb/usb_phy_gen_xceiv.h +++ b/include/linux/usb/usb_phy_gen_xceiv.h | |||
| @@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data { | |||
| 12 | unsigned int needs_reset:1; | 12 | unsigned int needs_reset:1; |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | #if IS_ENABLED(CONFIG_NOP_USB_XCEIV) | 15 | #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) |
| 16 | /* sometimes transceivers are accessed only through e.g. ULPI */ | 16 | /* sometimes transceivers are accessed only through e.g. ULPI */ |
| 17 | extern void usb_nop_xceiv_register(void); | 17 | extern void usb_nop_xceiv_register(void); |
| 18 | extern void usb_nop_xceiv_unregister(void); | 18 | extern void usb_nop_xceiv_unregister(void); |
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 9cb2fe8ca944..e303eef94dd5 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -42,6 +42,7 @@ struct usbnet { | |||
| 42 | struct usb_host_endpoint *status; | 42 | struct usb_host_endpoint *status; |
| 43 | unsigned maxpacket; | 43 | unsigned maxpacket; |
| 44 | struct timer_list delay; | 44 | struct timer_list delay; |
| 45 | const char *padding_pkt; | ||
| 45 | 46 | ||
| 46 | /* protocol/interface state */ | 47 | /* protocol/interface state */ |
| 47 | struct net_device *net; | 48 | struct net_device *net; |
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index bf99cd01be20..630356866030 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h | |||
| @@ -66,7 +66,9 @@ | |||
| 66 | US_FLAG(INITIAL_READ10, 0x00100000) \ | 66 | US_FLAG(INITIAL_READ10, 0x00100000) \ |
| 67 | /* Initial READ(10) (and others) must be retried */ \ | 67 | /* Initial READ(10) (and others) must be retried */ \ |
| 68 | US_FLAG(WRITE_CACHE, 0x00200000) \ | 68 | US_FLAG(WRITE_CACHE, 0x00200000) \ |
| 69 | /* Write Cache status is not available */ | 69 | /* Write Cache status is not available */ \ |
| 70 | US_FLAG(NEEDS_CAP16, 0x00400000) | ||
| 71 | /* cannot handle READ_CAPACITY_10 */ | ||
| 70 | 72 | ||
| 71 | #define US_FLAG(name, value) US_FL_##name = value , | 73 | #define US_FLAG(name, value) US_FL_##name = value , |
| 72 | enum { US_DO_ALL_FLAGS }; | 74 | enum { US_DO_ALL_FLAGS }; |
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 80cf8173a65b..2c02f3a8d2ba 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
| @@ -65,15 +65,8 @@ struct pci_dev; | |||
| 65 | * out of the arbitration process (and can be safe to take | 65 | * out of the arbitration process (and can be safe to take |
| 66 | * interrupts at any time. | 66 | * interrupts at any time. |
| 67 | */ | 67 | */ |
| 68 | #if defined(CONFIG_VGA_ARB) | ||
| 69 | extern void vga_set_legacy_decoding(struct pci_dev *pdev, | 68 | extern void vga_set_legacy_decoding(struct pci_dev *pdev, |
| 70 | unsigned int decodes); | 69 | unsigned int decodes); |
| 71 | #else | ||
| 72 | static inline void vga_set_legacy_decoding(struct pci_dev *pdev, | ||
| 73 | unsigned int decodes) | ||
| 74 | { | ||
| 75 | } | ||
| 76 | #endif | ||
| 77 | 70 | ||
| 78 | /** | 71 | /** |
| 79 | * vga_get - acquire & locks VGA resources | 72 | * vga_get - acquire & locks VGA resources |
diff --git a/include/linux/yam.h b/include/linux/yam.h index 7fe28228b274..512cdc2fb80f 100644 --- a/include/linux/yam.h +++ b/include/linux/yam.h | |||
| @@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg { | |||
| 77 | 77 | ||
| 78 | struct yamdrv_ioctl_mcs { | 78 | struct yamdrv_ioctl_mcs { |
| 79 | int cmd; | 79 | int cmd; |
| 80 | int bitrate; | 80 | unsigned int bitrate; |
| 81 | unsigned char bits[YAM_FPGA_SIZE]; | 81 | unsigned char bits[YAM_FPGA_SIZE]; |
| 82 | }; | 82 | }; |
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index fb314de2b61b..86505bfa5d2c 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -67,6 +67,10 @@ int ipv6_chk_addr(struct net *net, const struct in6_addr *addr, | |||
| 67 | int ipv6_chk_home_addr(struct net *net, const struct in6_addr *addr); | 67 | int ipv6_chk_home_addr(struct net *net, const struct in6_addr *addr); |
| 68 | #endif | 68 | #endif |
| 69 | 69 | ||
| 70 | bool ipv6_chk_custom_prefix(const struct in6_addr *addr, | ||
| 71 | const unsigned int prefix_len, | ||
| 72 | struct net_device *dev); | ||
| 73 | |||
| 70 | int ipv6_chk_prefix(const struct in6_addr *addr, struct net_device *dev); | 74 | int ipv6_chk_prefix(const struct in6_addr *addr, struct net_device *dev); |
| 71 | 75 | ||
| 72 | struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, | 76 | struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, |
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index aaeaf0938ec0..15f10841e2b5 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -104,6 +104,7 @@ enum { | |||
| 104 | enum { | 104 | enum { |
| 105 | HCI_SETUP, | 105 | HCI_SETUP, |
| 106 | HCI_AUTO_OFF, | 106 | HCI_AUTO_OFF, |
| 107 | HCI_RFKILLED, | ||
| 107 | HCI_MGMT, | 108 | HCI_MGMT, |
| 108 | HCI_PAIRABLE, | 109 | HCI_PAIRABLE, |
| 109 | HCI_SERVICE_CACHE, | 110 | HCI_SERVICE_CACHE, |
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h index a7a683e30b64..a8c2ef6d3b93 100644 --- a/include/net/cipso_ipv4.h +++ b/include/net/cipso_ipv4.h | |||
| @@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, | |||
| 290 | unsigned char err_offset = 0; | 290 | unsigned char err_offset = 0; |
| 291 | u8 opt_len = opt[1]; | 291 | u8 opt_len = opt[1]; |
| 292 | u8 opt_iter; | 292 | u8 opt_iter; |
| 293 | u8 tag_len; | ||
| 293 | 294 | ||
| 294 | if (opt_len < 8) { | 295 | if (opt_len < 8) { |
| 295 | err_offset = 1; | 296 | err_offset = 1; |
| @@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, | |||
| 302 | } | 303 | } |
| 303 | 304 | ||
| 304 | for (opt_iter = 6; opt_iter < opt_len;) { | 305 | for (opt_iter = 6; opt_iter < opt_len;) { |
| 305 | if (opt[opt_iter + 1] > (opt_len - opt_iter)) { | 306 | tag_len = opt[opt_iter + 1]; |
| 307 | if ((tag_len == 0) || (opt[opt_iter + 1] > (opt_len - opt_iter))) { | ||
| 306 | err_offset = opt_iter + 1; | 308 | err_offset = opt_iter + 1; |
| 307 | goto out; | 309 | goto out; |
| 308 | } | 310 | } |
| 309 | opt_iter += opt[opt_iter + 1]; | 311 | opt_iter += tag_len; |
| 310 | } | 312 | } |
| 311 | 313 | ||
| 312 | out: | 314 | out: |
diff --git a/include/net/dst.h b/include/net/dst.h index 3bc4865f8267..3c4c944096c9 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -479,10 +479,22 @@ static inline struct dst_entry *xfrm_lookup(struct net *net, | |||
| 479 | { | 479 | { |
| 480 | return dst_orig; | 480 | return dst_orig; |
| 481 | } | 481 | } |
| 482 | |||
| 483 | static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) | ||
| 484 | { | ||
| 485 | return NULL; | ||
| 486 | } | ||
| 487 | |||
| 482 | #else | 488 | #else |
| 483 | extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, | 489 | extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, |
| 484 | const struct flowi *fl, struct sock *sk, | 490 | const struct flowi *fl, struct sock *sk, |
| 485 | int flags); | 491 | int flags); |
| 492 | |||
| 493 | /* skb attached with this dst needs transformation if dst->xfrm is valid */ | ||
| 494 | static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) | ||
| 495 | { | ||
| 496 | return dst->xfrm; | ||
| 497 | } | ||
| 486 | #endif | 498 | #endif |
| 487 | 499 | ||
| 488 | #endif /* _NET_DST_H */ | 500 | #endif /* _NET_DST_H */ |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f525e7038cca..2b786b7e3585 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -194,11 +194,9 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb) | |||
| 194 | skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); | 194 | skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest) | 197 | static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt) |
| 198 | { | 198 | { |
| 199 | if (rt->rt6i_flags & RTF_GATEWAY) | 199 | return &rt->rt6i_gateway; |
| 200 | return &rt->rt6i_gateway; | ||
| 201 | return dest; | ||
| 202 | } | 200 | } |
| 203 | 201 | ||
| 204 | #endif | 202 | #endif |
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index f0d70f066f3d..9c4d37ec45a1 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -723,8 +723,6 @@ struct ip_vs_dest_dst { | |||
| 723 | struct rcu_head rcu_head; | 723 | struct rcu_head rcu_head; |
| 724 | }; | 724 | }; |
| 725 | 725 | ||
| 726 | /* In grace period after removing */ | ||
| 727 | #define IP_VS_DEST_STATE_REMOVING 0x01 | ||
| 728 | /* | 726 | /* |
| 729 | * The real server destination forwarding entry | 727 | * The real server destination forwarding entry |
| 730 | * with ip address, port number, and so on. | 728 | * with ip address, port number, and so on. |
| @@ -742,7 +740,7 @@ struct ip_vs_dest { | |||
| 742 | 740 | ||
| 743 | atomic_t refcnt; /* reference counter */ | 741 | atomic_t refcnt; /* reference counter */ |
| 744 | struct ip_vs_stats stats; /* statistics */ | 742 | struct ip_vs_stats stats; /* statistics */ |
| 745 | unsigned long state; /* state flags */ | 743 | unsigned long idle_start; /* start time, jiffies */ |
| 746 | 744 | ||
| 747 | /* connection counters and thresholds */ | 745 | /* connection counters and thresholds */ |
| 748 | atomic_t activeconns; /* active connections */ | 746 | atomic_t activeconns; /* active connections */ |
| @@ -756,14 +754,13 @@ struct ip_vs_dest { | |||
| 756 | struct ip_vs_dest_dst __rcu *dest_dst; /* cached dst info */ | 754 | struct ip_vs_dest_dst __rcu *dest_dst; /* cached dst info */ |
| 757 | 755 | ||
| 758 | /* for virtual service */ | 756 | /* for virtual service */ |
| 759 | struct ip_vs_service *svc; /* service it belongs to */ | 757 | struct ip_vs_service __rcu *svc; /* service it belongs to */ |
| 760 | __u16 protocol; /* which protocol (TCP/UDP) */ | 758 | __u16 protocol; /* which protocol (TCP/UDP) */ |
| 761 | __be16 vport; /* virtual port number */ | 759 | __be16 vport; /* virtual port number */ |
| 762 | union nf_inet_addr vaddr; /* virtual IP address */ | 760 | union nf_inet_addr vaddr; /* virtual IP address */ |
| 763 | __u32 vfwmark; /* firewall mark of service */ | 761 | __u32 vfwmark; /* firewall mark of service */ |
| 764 | 762 | ||
| 765 | struct list_head t_list; /* in dest_trash */ | 763 | struct list_head t_list; /* in dest_trash */ |
| 766 | struct rcu_head rcu_head; | ||
| 767 | unsigned int in_rs_table:1; /* we are in rs_table */ | 764 | unsigned int in_rs_table:1; /* we are in rs_table */ |
| 768 | }; | 765 | }; |
| 769 | 766 | ||
| @@ -1649,7 +1646,7 @@ static inline void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) | |||
| 1649 | /* CONFIG_IP_VS_NFCT */ | 1646 | /* CONFIG_IP_VS_NFCT */ |
| 1650 | #endif | 1647 | #endif |
| 1651 | 1648 | ||
| 1652 | static inline unsigned int | 1649 | static inline int |
| 1653 | ip_vs_dest_conn_overhead(struct ip_vs_dest *dest) | 1650 | ip_vs_dest_conn_overhead(struct ip_vs_dest *dest) |
| 1654 | { | 1651 | { |
| 1655 | /* | 1652 | /* |
diff --git a/include/net/mac802154.h b/include/net/mac802154.h index d0d11df9cba1..807d6b7a943f 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h | |||
| @@ -133,7 +133,7 @@ struct ieee802154_ops { | |||
| 133 | 133 | ||
| 134 | /* Basic interface to register ieee802154 device */ | 134 | /* Basic interface to register ieee802154 device */ |
| 135 | struct ieee802154_dev * | 135 | struct ieee802154_dev * |
| 136 | ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops); | 136 | ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops); |
| 137 | void ieee802154_free_device(struct ieee802154_dev *dev); | 137 | void ieee802154_free_device(struct ieee802154_dev *dev); |
| 138 | int ieee802154_register_device(struct ieee802154_dev *dev); | 138 | int ieee802154_register_device(struct ieee802154_dev *dev); |
| 139 | void ieee802154_unregister_device(struct ieee802154_dev *dev); | 139 | void ieee802154_unregister_device(struct ieee802154_dev *dev); |
diff --git a/include/net/mrp.h b/include/net/mrp.h index 4fbf02aa2ec1..0f7558b638ae 100644 --- a/include/net/mrp.h +++ b/include/net/mrp.h | |||
| @@ -112,6 +112,7 @@ struct mrp_applicant { | |||
| 112 | struct mrp_application *app; | 112 | struct mrp_application *app; |
| 113 | struct net_device *dev; | 113 | struct net_device *dev; |
| 114 | struct timer_list join_timer; | 114 | struct timer_list join_timer; |
| 115 | struct timer_list periodic_timer; | ||
| 115 | 116 | ||
| 116 | spinlock_t lock; | 117 | spinlock_t lock; |
| 117 | struct sk_buff_head queue; | 118 | struct sk_buff_head queue; |
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 1313456a0994..9d22f08896c6 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
| @@ -74,6 +74,7 @@ struct net { | |||
| 74 | struct hlist_head *dev_index_head; | 74 | struct hlist_head *dev_index_head; |
| 75 | unsigned int dev_base_seq; /* protected by rtnl_mutex */ | 75 | unsigned int dev_base_seq; /* protected by rtnl_mutex */ |
| 76 | int ifindex; | 76 | int ifindex; |
| 77 | unsigned int dev_unreg_count; | ||
| 77 | 78 | ||
| 78 | /* core fib_rules */ | 79 | /* core fib_rules */ |
| 79 | struct list_head rules_ops; | 80 | struct list_head rules_ops; |
diff --git a/include/net/netfilter/nf_conntrack_synproxy.h b/include/net/netfilter/nf_conntrack_synproxy.h index 806f54a290d6..f572f313d6f1 100644 --- a/include/net/netfilter/nf_conntrack_synproxy.h +++ b/include/net/netfilter/nf_conntrack_synproxy.h | |||
| @@ -56,7 +56,7 @@ struct synproxy_options { | |||
| 56 | 56 | ||
| 57 | struct tcphdr; | 57 | struct tcphdr; |
| 58 | struct xt_synproxy_info; | 58 | struct xt_synproxy_info; |
| 59 | extern void synproxy_parse_options(const struct sk_buff *skb, unsigned int doff, | 59 | extern bool synproxy_parse_options(const struct sk_buff *skb, unsigned int doff, |
| 60 | const struct tcphdr *th, | 60 | const struct tcphdr *th, |
| 61 | struct synproxy_options *opts); | 61 | struct synproxy_options *opts); |
| 62 | extern unsigned int synproxy_options_size(const struct synproxy_options *opts); | 62 | extern unsigned int synproxy_options_size(const struct synproxy_options *opts); |
diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h index 6ca975bebd37..c2e542b27a5a 100644 --- a/include/net/secure_seq.h +++ b/include/net/secure_seq.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | extern void net_secret_init(void); | ||
| 7 | extern __u32 secure_ip_id(__be32 daddr); | 6 | extern __u32 secure_ip_id(__be32 daddr); |
| 8 | extern __u32 secure_ipv6_id(const __be32 daddr[4]); | 7 | extern __u32 secure_ipv6_id(const __be32 daddr[4]); |
| 9 | extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); | 8 | extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); |
diff --git a/include/net/sock.h b/include/net/sock.h index 6ba2e7b0e2b1..808cbc2ec6c1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -409,6 +409,11 @@ struct sock { | |||
| 409 | void (*sk_destruct)(struct sock *sk); | 409 | void (*sk_destruct)(struct sock *sk); |
| 410 | }; | 410 | }; |
| 411 | 411 | ||
| 412 | #define __sk_user_data(sk) ((*((void __rcu **)&(sk)->sk_user_data))) | ||
| 413 | |||
| 414 | #define rcu_dereference_sk_user_data(sk) rcu_dereference(__sk_user_data((sk))) | ||
| 415 | #define rcu_assign_sk_user_data(sk, ptr) rcu_assign_pointer(__sk_user_data((sk)), ptr) | ||
| 416 | |||
| 412 | /* | 417 | /* |
| 413 | * SK_CAN_REUSE and SK_NO_REUSE on a socket mean that the socket is OK | 418 | * SK_CAN_REUSE and SK_NO_REUSE on a socket mean that the socket is OK |
| 414 | * or not whether his port will be reused by someone else. SK_FORCE_REUSE | 419 | * or not whether his port will be reused by someone else. SK_FORCE_REUSE |
| @@ -1625,16 +1630,14 @@ static inline void sk_filter_release(struct sk_filter *fp) | |||
| 1625 | 1630 | ||
| 1626 | static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) | 1631 | static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) |
| 1627 | { | 1632 | { |
| 1628 | unsigned int size = sk_filter_len(fp); | 1633 | atomic_sub(sk_filter_size(fp->len), &sk->sk_omem_alloc); |
| 1629 | |||
| 1630 | atomic_sub(size, &sk->sk_omem_alloc); | ||
| 1631 | sk_filter_release(fp); | 1634 | sk_filter_release(fp); |
| 1632 | } | 1635 | } |
| 1633 | 1636 | ||
| 1634 | static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) | 1637 | static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) |
| 1635 | { | 1638 | { |
| 1636 | atomic_inc(&fp->refcnt); | 1639 | atomic_inc(&fp->refcnt); |
| 1637 | atomic_add(sk_filter_len(fp), &sk->sk_omem_alloc); | 1640 | atomic_add(sk_filter_size(fp->len), &sk->sk_omem_alloc); |
| 1638 | } | 1641 | } |
| 1639 | 1642 | ||
| 1640 | /* | 1643 | /* |
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index fe66533e9b7a..fb0a312bcb81 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h | |||
| @@ -68,6 +68,7 @@ struct rsnd_scu_platform_info { | |||
| 68 | * | 68 | * |
| 69 | * A : generation | 69 | * A : generation |
| 70 | */ | 70 | */ |
| 71 | #define RSND_GEN_MASK (0xF << 0) | ||
| 71 | #define RSND_GEN1 (1 << 0) /* fixme */ | 72 | #define RSND_GEN1 (1 << 0) /* fixme */ |
| 72 | #define RSND_GEN2 (2 << 0) /* fixme */ | 73 | #define RSND_GEN2 (2 << 0) /* fixme */ |
| 73 | 74 | ||
diff --git a/include/trace/events/target.h b/include/trace/events/target.h index aef8fc354025..da9cc0f05c93 100644 --- a/include/trace/events/target.h +++ b/include/trace/events/target.h | |||
| @@ -144,7 +144,7 @@ TRACE_EVENT(target_sequencer_start, | |||
| 144 | ), | 144 | ), |
| 145 | 145 | ||
| 146 | TP_fast_assign( | 146 | TP_fast_assign( |
| 147 | __entry->unpacked_lun = cmd->se_lun->unpacked_lun; | 147 | __entry->unpacked_lun = cmd->orig_fe_lun; |
| 148 | __entry->opcode = cmd->t_task_cdb[0]; | 148 | __entry->opcode = cmd->t_task_cdb[0]; |
| 149 | __entry->data_length = cmd->data_length; | 149 | __entry->data_length = cmd->data_length; |
| 150 | __entry->task_attribute = cmd->sam_task_attr; | 150 | __entry->task_attribute = cmd->sam_task_attr; |
| @@ -182,7 +182,7 @@ TRACE_EVENT(target_cmd_complete, | |||
| 182 | ), | 182 | ), |
| 183 | 183 | ||
| 184 | TP_fast_assign( | 184 | TP_fast_assign( |
| 185 | __entry->unpacked_lun = cmd->se_lun->unpacked_lun; | 185 | __entry->unpacked_lun = cmd->orig_fe_lun; |
| 186 | __entry->opcode = cmd->t_task_cdb[0]; | 186 | __entry->opcode = cmd->t_task_cdb[0]; |
| 187 | __entry->data_length = cmd->data_length; | 187 | __entry->data_length = cmd->data_length; |
| 188 | __entry->task_attribute = cmd->sam_task_attr; | 188 | __entry->task_attribute = cmd->sam_task_attr; |
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index c2c4ace3db61..f104c2603ebe 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h | |||
| @@ -240,6 +240,8 @@ struct drm_mode_get_connector { | |||
| 240 | __u32 connection; | 240 | __u32 connection; |
| 241 | __u32 mm_width, mm_height; /**< HxW in millimeters */ | 241 | __u32 mm_width, mm_height; /**< HxW in millimeters */ |
| 242 | __u32 subpixel; | 242 | __u32 subpixel; |
| 243 | |||
| 244 | __u32 pad; | ||
| 243 | }; | 245 | }; |
| 244 | 246 | ||
| 245 | #define DRM_MODE_PROP_PENDING (1<<0) | 247 | #define DRM_MODE_PROP_PENDING (1<<0) |
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 009a655a5d35..2fc1602e23bb 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h | |||
| @@ -456,13 +456,15 @@ struct perf_event_mmap_page { | |||
| 456 | /* | 456 | /* |
| 457 | * Control data for the mmap() data buffer. | 457 | * Control data for the mmap() data buffer. |
| 458 | * | 458 | * |
| 459 | * User-space reading the @data_head value should issue an rmb(), on | 459 | * User-space reading the @data_head value should issue an smp_rmb(), |
| 460 | * SMP capable platforms, after reading this value -- see | 460 | * after reading this value. |
| 461 | * perf_event_wakeup(). | ||
| 462 | * | 461 | * |
| 463 | * When the mapping is PROT_WRITE the @data_tail value should be | 462 | * When the mapping is PROT_WRITE the @data_tail value should be |
| 464 | * written by userspace to reflect the last read data. In this case | 463 | * written by userspace to reflect the last read data, after issueing |
| 465 | * the kernel will not over-write unread data. | 464 | * an smp_mb() to separate the data read from the ->data_tail store. |
| 465 | * In this case the kernel will not over-write unread data. | ||
| 466 | * | ||
| 467 | * See perf_output_put_handle() for the data ordering. | ||
| 466 | */ | 468 | */ |
| 467 | __u64 data_head; /* head in the data section */ | 469 | __u64 data_head; /* head in the data section */ |
| 468 | __u64 data_tail; /* user-space written tail */ | 470 | __u64 data_tail; /* user-space written tail */ |
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index 0623ec4e728f..56f121605c99 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | # UAPI Header export list | 1 | # UAPI Header export list |
| 2 | header-y += tc_csum.h | 2 | header-y += tc_csum.h |
| 3 | header-y += tc_defact.h | ||
| 3 | header-y += tc_gact.h | 4 | header-y += tc_gact.h |
| 4 | header-y += tc_ipt.h | 5 | header-y += tc_ipt.h |
| 5 | header-y += tc_mirred.h | 6 | header-y += tc_mirred.h |
diff --git a/include/linux/tc_act/tc_defact.h b/include/uapi/linux/tc_act/tc_defact.h index 6f65d07c7ce2..17dddb40f740 100644 --- a/include/linux/tc_act/tc_defact.h +++ b/include/uapi/linux/tc_act/tc_defact.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | struct tc_defact { | 6 | struct tc_defact { |
| 7 | tc_gen; | 7 | tc_gen; |
| 8 | }; | 8 | }; |
| 9 | 9 | ||
| 10 | enum { | 10 | enum { |
| 11 | TCA_DEF_UNSPEC, | 11 | TCA_DEF_UNSPEC, |
| 12 | TCA_DEF_TM, | 12 | TCA_DEF_TM, |
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 0b233c56b0e4..e3ddd86c90a6 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h | |||
| @@ -87,8 +87,10 @@ enum { | |||
| 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, | 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, |
| 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, | 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, |
| 89 | IB_USER_VERBS_CMD_OPEN_QP, | 89 | IB_USER_VERBS_CMD_OPEN_QP, |
| 90 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 90 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, | 91 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, |
| 91 | IB_USER_VERBS_CMD_DESTROY_FLOW | 92 | IB_USER_VERBS_CMD_DESTROY_FLOW |
| 93 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 92 | }; | 94 | }; |
| 93 | 95 | ||
| 94 | /* | 96 | /* |
| @@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { | |||
| 126 | __u16 out_words; | 128 | __u16 out_words; |
| 127 | }; | 129 | }; |
| 128 | 130 | ||
| 131 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 129 | struct ib_uverbs_cmd_hdr_ex { | 132 | struct ib_uverbs_cmd_hdr_ex { |
| 130 | __u32 command; | 133 | __u32 command; |
| 131 | __u16 in_words; | 134 | __u16 in_words; |
| @@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { | |||
| 134 | __u16 provider_out_words; | 137 | __u16 provider_out_words; |
| 135 | __u32 cmd_hdr_reserved; | 138 | __u32 cmd_hdr_reserved; |
| 136 | }; | 139 | }; |
| 140 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 137 | 141 | ||
| 138 | struct ib_uverbs_get_context { | 142 | struct ib_uverbs_get_context { |
| 139 | __u64 response; | 143 | __u64 response; |
| @@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { | |||
| 696 | __u64 driver_data[0]; | 700 | __u64 driver_data[0]; |
| 697 | }; | 701 | }; |
| 698 | 702 | ||
| 703 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 699 | struct ib_kern_eth_filter { | 704 | struct ib_kern_eth_filter { |
| 700 | __u8 dst_mac[6]; | 705 | __u8 dst_mac[6]; |
| 701 | __u8 src_mac[6]; | 706 | __u8 src_mac[6]; |
| @@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { | |||
| 780 | __u32 comp_mask; | 785 | __u32 comp_mask; |
| 781 | __u32 flow_handle; | 786 | __u32 flow_handle; |
| 782 | }; | 787 | }; |
| 788 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 783 | 789 | ||
| 784 | struct ib_uverbs_create_srq { | 790 | struct ib_uverbs_create_srq { |
| 785 | __u64 response; | 791 | __u64 response; |
