Skip to content

Commit 965c4b7

Browse files
committed
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
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'
4 parents f616751 + 56fb2d6 + 62c6151 + f5d6d2d commit 965c4b7

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/pci/msi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ static int msi_verify_entries(struct pci_dev *dev)
610610
* msi_capability_init - configure device's MSI capability structure
611611
* @dev: pointer to the pci_dev data structure of MSI device function
612612
* @nvec: number of interrupts to allocate
613+
* @affinity: flag to indicate cpu irq affinity mask should be set
613614
*
614615
* Setup the MSI capability structure of the device with the requested
615616
* number of interrupts. A return value of zero indicates the successful
@@ -752,6 +753,7 @@ static void msix_program_entries(struct pci_dev *dev,
752753
* @dev: pointer to the pci_dev data structure of MSI-X device function
753754
* @entries: pointer to an array of struct msix_entry entries
754755
* @nvec: number of @entries
756+
* @affinity: flag to indicate cpu irq affinity mask should be set
755757
*
756758
* Setup the MSI-X capability structure of device function with a
757759
* single MSI-X irq. A return of zero indicates the successful setup of

kernel/sched/fair.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8839,7 +8839,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
88398839
{
88408840
struct sched_entity *se;
88418841
struct cfs_rq *cfs_rq;
8842-
struct rq *rq;
88438842
int i;
88448843

88458844
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)
88548853
init_cfs_bandwidth(tg_cfs_bandwidth(tg));
88558854

88568855
for_each_possible_cpu(i) {
8857-
rq = cpu_rq(i);
8858-
88598856
cfs_rq = kzalloc_node(sizeof(struct cfs_rq),
88608857
GFP_KERNEL, cpu_to_node(i));
88618858
if (!cfs_rq)

tools/objtool/builtin-check.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ static struct rela *find_switch_table(struct objtool_file *file,
754754
if (insn->type == INSN_JUMP_UNCONDITIONAL &&
755755
insn->jump_dest &&
756756
(insn->jump_dest->offset <= insn->offset ||
757-
insn->jump_dest->offset >= orig_insn->offset))
757+
insn->jump_dest->offset > orig_insn->offset))
758758
break;
759759

760760
text_rela = find_rela_by_dest_range(insn->sec, insn->offset,

0 commit comments

Comments
 (0)