TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'core-urgent-for-linus', 'irq-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull objtool, irq and scheduler fixes from Ingo Molnar:
 "One more objtool fixlet for GCC6 code generation patterns, an irq
  DocBook fix and an unused variable warning fix in the scheduler"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix rare switch jump table pattern detection

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  doc: Add missing parameter for msi_setup

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Remove unused but set variable 'rq'
This commit is contained in:
Linus Torvalds
2016-10-28 10:12:27 -07:00
parent f6167514c8 56fb2d6eb6 62c6151419 f5d6d2da0d
commit 965c4b7e1a
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/pci/msi.c
+2
View File
@@ -610,6 +610,7 @@ static int msi_verify_entries(struct pci_dev *dev)
* msi_capability_init - configure device's MSI capability structure * msi_capability_init - configure device's MSI capability structure
* @dev: pointer to the pci_dev data structure of MSI device function * @dev: pointer to the pci_dev data structure of MSI device function
* @nvec: number of interrupts to allocate * @nvec: number of interrupts to allocate
* @affinity: flag to indicate cpu irq affinity mask should be set
* *
* Setup the MSI capability structure of the device with the requested * Setup the MSI capability structure of the device with the requested
* number of interrupts. A return value of zero indicates the successful * number of interrupts. A return value of zero indicates the successful
@@ -752,6 +753,7 @@ static void msix_program_entries(struct pci_dev *dev,
* @dev: pointer to the pci_dev data structure of MSI-X device function * @dev: pointer to the pci_dev data structure of MSI-X device function
* @entries: pointer to an array of struct msix_entry entries * @entries: pointer to an array of struct msix_entry entries
* @nvec: number of @entries * @nvec: number of @entries
* @affinity: flag to indicate cpu irq affinity mask should be set
* *
* Setup the MSI-X capability structure of device function with a * Setup the MSI-X capability structure of device function with a
* single MSI-X irq. A return of zero indicates the successful setup of * single MSI-X irq. A return of zero indicates the successful setup of
kernel/sched/fair.c
-3
View File
@@ -8839,7 +8839,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
{ {
struct sched_entity *se; struct sched_entity *se;
struct cfs_rq *cfs_rq; struct cfs_rq *cfs_rq;
struct rq *rq;
int i; int i;
tg->cfs_rq = kzalloc(sizeof(cfs_rq) * nr_cpu_ids, GFP_KERNEL); tg->cfs_rq = kzalloc(sizeof(cfs_rq) * nr_cpu_ids, GFP_KERNEL);
@@ -8854,8 +8853,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
init_cfs_bandwidth(tg_cfs_bandwidth(tg)); init_cfs_bandwidth(tg_cfs_bandwidth(tg));
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
rq = cpu_rq(i);
cfs_rq = kzalloc_node(sizeof(struct cfs_rq), cfs_rq = kzalloc_node(sizeof(struct cfs_rq),
GFP_KERNEL, cpu_to_node(i)); GFP_KERNEL, cpu_to_node(i));
if (!cfs_rq) if (!cfs_rq)
tools/objtool/builtin-check.c
+1 -1
View File
@@ -754,7 +754,7 @@ static struct rela *find_switch_table(struct objtool_file *file,
if (insn->type == INSN_JUMP_UNCONDITIONAL && if (insn->type == INSN_JUMP_UNCONDITIONAL &&
insn->jump_dest && insn->jump_dest &&
(insn->jump_dest->offset <= insn->offset || (insn->jump_dest->offset <= insn->offset ||
insn->jump_dest->offset >= orig_insn->offset)) insn->jump_dest->offset > orig_insn->offset))
break; break;
text_rela = find_rela_by_dest_range(insn->sec, insn->offset, text_rela = find_rela_by_dest_range(insn->sec, insn->offset,