diff for duplicates of <1383512174.4776.20.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index f85e71a..4acac5e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -278,8 +278,8 @@ Ben. > > - task->thread.dac1 = data & ~0x3UL; > > + task->thread.debug.dac1 = data & ~0x3UL; > > -> > - if (task->thread.dac1 = 0) { -> > + if (task->thread.debug.dac1 = 0) { +> > - if (task->thread.dac1 == 0) { +> > + if (task->thread.debug.dac1 == 0) { > > dbcr_dac(task) &= ~(DBCR_DAC1R | DBCR_DAC1W); > > - if (!DBCR_ACTIVE_EVENTS(task->thread.dbcr0, > > - task->thread.dbcr1)) { @@ -325,7 +325,7 @@ Ben. > > + child->thread.debug.iac1 = bp_info->addr; > > + child->thread.debug.iac2 = bp_info->addr2; > > + child->thread.debug.dbcr0 |= DBCR0_IAC1; -> > if (bp_info->addr_mode = +> > if (bp_info->addr_mode == > > PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE) > > dbcr_iac_range(child) |= DBCR_IAC12X; > > @@ -1104,9 +1104,9 @@ static long set_instruction_bp(struct task_struct *child, @@ -338,12 +338,12 @@ Ben. > > + child->thread.debug.iac3 = bp_info->addr; > > + child->thread.debug.iac4 = bp_info->addr2; > > + child->thread.debug.dbcr0 |= DBCR0_IAC3; -> > if (bp_info->addr_mode = +> > if (bp_info->addr_mode == > > PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE) > > dbcr_iac_range(child) |= DBCR_IAC34X; > > @@ -1126,30 +1126,30 @@ static long set_instruction_bp(struct task_struct *child, > > */ -> > if (slot2_in_use || (slot3_in_use = slot4_in_use)) { +> > if (slot2_in_use || (slot3_in_use == slot4_in_use)) { > > slot = 1; > > - child->thread.iac1 = bp_info->addr; > > - child->thread.dbcr0 |= DBCR0_IAC1; @@ -385,8 +385,8 @@ Ben. > > { > > switch (slot) { > > case 1: -> > - if ((child->thread.dbcr0 & DBCR0_IAC1) = 0) -> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC1) = 0) +> > - if ((child->thread.dbcr0 & DBCR0_IAC1) == 0) +> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC1) == 0) > > return -ENOENT; > > > > if (dbcr_iac_range(child) & DBCR_IAC12MODE) { @@ -401,8 +401,8 @@ Ben. > > + child->thread.debug.dbcr0 &= ~DBCR0_IAC1; > > break; > > case 2: -> > - if ((child->thread.dbcr0 & DBCR0_IAC2) = 0) -> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC2) = 0) +> > - if ((child->thread.dbcr0 & DBCR0_IAC2) == 0) +> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC2) == 0) > > return -ENOENT; > > > > if (dbcr_iac_range(child) & DBCR_IAC12MODE) @@ -415,8 +415,8 @@ Ben. > > break; > > #if CONFIG_PPC_ADV_DEBUG_IACS > 2 > > case 3: -> > - if ((child->thread.dbcr0 & DBCR0_IAC3) = 0) -> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC3) = 0) +> > - if ((child->thread.dbcr0 & DBCR0_IAC3) == 0) +> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC3) == 0) > > return -ENOENT; > > > > if (dbcr_iac_range(child) & DBCR_IAC34MODE) { @@ -431,8 +431,8 @@ Ben. > > + child->thread.debug.dbcr0 &= ~DBCR0_IAC3; > > break; > > case 4: -> > - if ((child->thread.dbcr0 & DBCR0_IAC4) = 0) -> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC4) = 0) +> > - if ((child->thread.dbcr0 & DBCR0_IAC4) == 0) +> > + if ((child->thread.debug.dbcr0 & DBCR0_IAC4) == 0) > > return -ENOENT; > > > > if (dbcr_iac_range(child) & DBCR_IAC34MODE) @@ -453,8 +453,12 @@ Ben. > > + child->thread.debug.dac1 = (unsigned long)bp_info->addr; > > #if CONFIG_PPC_ADV_DEBUG_DVCS > 0 > > if (byte_enable) { -> > - child->thread.dvc1 > > + child->thread.debug.dvc1 > > (unsigned long)bp_info->condition_value; -> > - child->thread.dbcr2 |> > + child->thread.debug.dbcr2 |> > ((byte_enable << DBCR2_DVC1BE_SHIFT) | +> > - child->thread.dvc1 = +> > + child->thread.debug.dvc1 = +> > (unsigned long)bp_info->condition_value; +> > - child->thread.dbcr2 |= +> > + child->thread.debug.dbcr2 |= +> > ((byte_enable << DBCR2_DVC1BE_SHIFT) | > > (condition_mode << DBCR2_DVC1M_SHIFT)); > > } > > #endif @@ -472,8 +476,12 @@ Ben. > > + child->thread.debug.dac2 = (unsigned long)bp_info->addr; > > #if CONFIG_PPC_ADV_DEBUG_DVCS > 0 > > if (byte_enable) { -> > - child->thread.dvc2 > > + child->thread.debug.dvc2 > > (unsigned long)bp_info->condition_value; -> > - child->thread.dbcr2 |> > + child->thread.debug.dbcr2 |> > ((byte_enable << DBCR2_DVC2BE_SHIFT) | +> > - child->thread.dvc2 = +> > + child->thread.debug.dvc2 = +> > (unsigned long)bp_info->condition_value; +> > - child->thread.dbcr2 |= +> > + child->thread.debug.dbcr2 |= +> > ((byte_enable << DBCR2_DVC2BE_SHIFT) | > > (condition_mode << DBCR2_DVC2M_SHIFT)); > > } > > #endif @@ -485,7 +493,7 @@ Ben. > > > > return slot + 4; > > @@ -1276,32 +1276,32 @@ static int del_dac(struct task_struct *child, int slot) -> > if ((dbcr_dac(child) & (DBCR_DAC1R | DBCR_DAC1W)) = 0) +> > if ((dbcr_dac(child) & (DBCR_DAC1R | DBCR_DAC1W)) == 0) > > return -ENOENT; > > > > - child->thread.dac1 = 0; @@ -506,8 +514,8 @@ Ben. > > - child->thread.dvc1 = 0; > > + child->thread.debug.dvc1 = 0; > > #endif -> > } else if (slot = 2) { -> > if ((dbcr_dac(child) & (DBCR_DAC2R | DBCR_DAC2W)) = 0) +> > } else if (slot == 2) { +> > if ((dbcr_dac(child) & (DBCR_DAC2R | DBCR_DAC2W)) == 0) > > return -ENOENT; > > > > #ifdef CONFIG_PPC_ADV_DEBUG_DAC_RANGE @@ -546,10 +554,10 @@ Ben. > > + child->thread.debug.dbcr0 |= (DBCR0_DAC1W | DBCR0_IDM); > > + child->thread.debug.dac1 = bp_info->addr; > > + child->thread.debug.dac2 = bp_info->addr2; -> > if (mode = PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE) +> > if (mode == PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE) > > - child->thread.dbcr2 |= DBCR2_DAC12M; > > + child->thread.debug.dbcr2 |= DBCR2_DAC12M; -> > else if (mode = PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE) +> > else if (mode == PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE) > > - child->thread.dbcr2 |= DBCR2_DAC12MX; > > + child->thread.debug.dbcr2 |= DBCR2_DAC12MX; > > else /* PPC_BREAKPOINT_MODE_MASK */ diff --git a/a/content_digest b/N1/content_digest index 0f4cf3c..10c6cb2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020131103143012.GA7513@redhat.com\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PULL 34/51] powerpc: move debug registers in a structure\0" - "Date\0Sun, 03 Nov 2013 20:56:14 +0000\0" + "Date\0Mon, 04 Nov 2013 07:56:14 +1100\0" "To\0Gleb Natapov <gleb@redhat.com>\0" "Cc\0Alexander Graf <agraf@suse.de>" kvm@vger.kernel.org mailing list <kvm@vger.kernel.org> @@ -294,8 +294,8 @@ "> > -\ttask->thread.dac1 = data & ~0x3UL;\n" "> > +\ttask->thread.debug.dac1 = data & ~0x3UL;\n" "> > \n" - "> > -\tif (task->thread.dac1 = 0) {\n" - "> > +\tif (task->thread.debug.dac1 = 0) {\n" + "> > -\tif (task->thread.dac1 == 0) {\n" + "> > +\tif (task->thread.debug.dac1 == 0) {\n" "> > \t\tdbcr_dac(task) &= ~(DBCR_DAC1R | DBCR_DAC1W);\n" "> > -\t\tif (!DBCR_ACTIVE_EVENTS(task->thread.dbcr0,\n" "> > -\t\t\t\t\ttask->thread.dbcr1)) {\n" @@ -341,7 +341,7 @@ "> > +\t\t\tchild->thread.debug.iac1 = bp_info->addr;\n" "> > +\t\t\tchild->thread.debug.iac2 = bp_info->addr2;\n" "> > +\t\t\tchild->thread.debug.dbcr0 |= DBCR0_IAC1;\n" - "> > \t\t\tif (bp_info->addr_mode =\n" + "> > \t\t\tif (bp_info->addr_mode ==\n" "> > \t\t\t\t\tPPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE)\n" "> > \t\t\t\tdbcr_iac_range(child) |= DBCR_IAC12X;\n" "> > @@ -1104,9 +1104,9 @@ static long set_instruction_bp(struct task_struct *child,\n" @@ -354,12 +354,12 @@ "> > +\t\t\tchild->thread.debug.iac3 = bp_info->addr;\n" "> > +\t\t\tchild->thread.debug.iac4 = bp_info->addr2;\n" "> > +\t\t\tchild->thread.debug.dbcr0 |= DBCR0_IAC3;\n" - "> > \t\t\tif (bp_info->addr_mode =\n" + "> > \t\t\tif (bp_info->addr_mode ==\n" "> > \t\t\t\t\tPPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE)\n" "> > \t\t\t\tdbcr_iac_range(child) |= DBCR_IAC34X;\n" "> > @@ -1126,30 +1126,30 @@ static long set_instruction_bp(struct task_struct *child,\n" "> > \t\t\t */\n" - "> > \t\t\tif (slot2_in_use || (slot3_in_use = slot4_in_use)) {\n" + "> > \t\t\tif (slot2_in_use || (slot3_in_use == slot4_in_use)) {\n" "> > \t\t\t\tslot = 1;\n" "> > -\t\t\t\tchild->thread.iac1 = bp_info->addr;\n" "> > -\t\t\t\tchild->thread.dbcr0 |= DBCR0_IAC1;\n" @@ -401,8 +401,8 @@ "> > {\n" "> > \tswitch (slot) {\n" "> > \tcase 1:\n" - "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC1) = 0)\n" - "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC1) = 0)\n" + "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC1) == 0)\n" + "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC1) == 0)\n" "> > \t\t\treturn -ENOENT;\n" "> > \n" "> > \t\tif (dbcr_iac_range(child) & DBCR_IAC12MODE) {\n" @@ -417,8 +417,8 @@ "> > +\t\tchild->thread.debug.dbcr0 &= ~DBCR0_IAC1;\n" "> > \t\tbreak;\n" "> > \tcase 2:\n" - "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC2) = 0)\n" - "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC2) = 0)\n" + "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC2) == 0)\n" + "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC2) == 0)\n" "> > \t\t\treturn -ENOENT;\n" "> > \n" "> > \t\tif (dbcr_iac_range(child) & DBCR_IAC12MODE)\n" @@ -431,8 +431,8 @@ "> > \t\tbreak;\n" "> > #if CONFIG_PPC_ADV_DEBUG_IACS > 2\n" "> > \tcase 3:\n" - "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC3) = 0)\n" - "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC3) = 0)\n" + "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC3) == 0)\n" + "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC3) == 0)\n" "> > \t\t\treturn -ENOENT;\n" "> > \n" "> > \t\tif (dbcr_iac_range(child) & DBCR_IAC34MODE) {\n" @@ -447,8 +447,8 @@ "> > +\t\tchild->thread.debug.dbcr0 &= ~DBCR0_IAC3;\n" "> > \t\tbreak;\n" "> > \tcase 4:\n" - "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC4) = 0)\n" - "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC4) = 0)\n" + "> > -\t\tif ((child->thread.dbcr0 & DBCR0_IAC4) == 0)\n" + "> > +\t\tif ((child->thread.debug.dbcr0 & DBCR0_IAC4) == 0)\n" "> > \t\t\treturn -ENOENT;\n" "> > \n" "> > \t\tif (dbcr_iac_range(child) & DBCR_IAC34MODE)\n" @@ -469,8 +469,12 @@ "> > +\t\tchild->thread.debug.dac1 = (unsigned long)bp_info->addr;\n" "> > #if CONFIG_PPC_ADV_DEBUG_DVCS > 0\n" "> > \t\tif (byte_enable) {\n" - "> > -\t\t\tchild->thread.dvc1 > > +\t\t\tchild->thread.debug.dvc1 > > \t\t\t\t(unsigned long)bp_info->condition_value;\n" - "> > -\t\t\tchild->thread.dbcr2 |> > +\t\t\tchild->thread.debug.dbcr2 |> > \t\t\t\t((byte_enable << DBCR2_DVC1BE_SHIFT) |\n" + "> > -\t\t\tchild->thread.dvc1 =\n" + "> > +\t\t\tchild->thread.debug.dvc1 =\n" + "> > \t\t\t\t(unsigned long)bp_info->condition_value;\n" + "> > -\t\t\tchild->thread.dbcr2 |=\n" + "> > +\t\t\tchild->thread.debug.dbcr2 |=\n" + "> > \t\t\t\t((byte_enable << DBCR2_DVC1BE_SHIFT) |\n" "> > \t\t\t\t (condition_mode << DBCR2_DVC1M_SHIFT));\n" "> > \t\t}\n" "> > #endif\n" @@ -488,8 +492,12 @@ "> > +\t\tchild->thread.debug.dac2 = (unsigned long)bp_info->addr;\n" "> > #if CONFIG_PPC_ADV_DEBUG_DVCS > 0\n" "> > \t\tif (byte_enable) {\n" - "> > -\t\t\tchild->thread.dvc2 > > +\t\t\tchild->thread.debug.dvc2 > > \t\t\t\t(unsigned long)bp_info->condition_value;\n" - "> > -\t\t\tchild->thread.dbcr2 |> > +\t\t\tchild->thread.debug.dbcr2 |> > \t\t\t\t((byte_enable << DBCR2_DVC2BE_SHIFT) |\n" + "> > -\t\t\tchild->thread.dvc2 =\n" + "> > +\t\t\tchild->thread.debug.dvc2 =\n" + "> > \t\t\t\t(unsigned long)bp_info->condition_value;\n" + "> > -\t\t\tchild->thread.dbcr2 |=\n" + "> > +\t\t\tchild->thread.debug.dbcr2 |=\n" + "> > \t\t\t\t((byte_enable << DBCR2_DVC2BE_SHIFT) |\n" "> > \t\t\t\t (condition_mode << DBCR2_DVC2M_SHIFT));\n" "> > \t\t}\n" "> > #endif\n" @@ -501,7 +509,7 @@ "> > \n" "> > \treturn slot + 4;\n" "> > @@ -1276,32 +1276,32 @@ static int del_dac(struct task_struct *child, int slot)\n" - "> > \t\tif ((dbcr_dac(child) & (DBCR_DAC1R | DBCR_DAC1W)) = 0)\n" + "> > \t\tif ((dbcr_dac(child) & (DBCR_DAC1R | DBCR_DAC1W)) == 0)\n" "> > \t\t\treturn -ENOENT;\n" "> > \n" "> > -\t\tchild->thread.dac1 = 0;\n" @@ -522,8 +530,8 @@ "> > -\t\tchild->thread.dvc1 = 0;\n" "> > +\t\tchild->thread.debug.dvc1 = 0;\n" "> > #endif\n" - "> > \t} else if (slot = 2) {\n" - "> > \t\tif ((dbcr_dac(child) & (DBCR_DAC2R | DBCR_DAC2W)) = 0)\n" + "> > \t} else if (slot == 2) {\n" + "> > \t\tif ((dbcr_dac(child) & (DBCR_DAC2R | DBCR_DAC2W)) == 0)\n" "> > \t\t\treturn -ENOENT;\n" "> > \n" "> > #ifdef CONFIG_PPC_ADV_DEBUG_DAC_RANGE\n" @@ -562,10 +570,10 @@ "> > +\t\tchild->thread.debug.dbcr0 |= (DBCR0_DAC1W | DBCR0_IDM);\n" "> > +\tchild->thread.debug.dac1 = bp_info->addr;\n" "> > +\tchild->thread.debug.dac2 = bp_info->addr2;\n" - "> > \tif (mode = PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE)\n" + "> > \tif (mode == PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE)\n" "> > -\t\tchild->thread.dbcr2 |= DBCR2_DAC12M;\n" "> > +\t\tchild->thread.debug.dbcr2 |= DBCR2_DAC12M;\n" - "> > \telse if (mode = PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE)\n" + "> > \telse if (mode == PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE)\n" "> > -\t\tchild->thread.dbcr2 |= DBCR2_DAC12MX;\n" "> > +\t\tchild->thread.debug.dbcr2 |= DBCR2_DAC12MX;\n" "> > \telse\t/* PPC_BREAKPOINT_MODE_MASK */\n" @@ -753,4 +761,4 @@ "> --\n" "> \t\t\tGleb." -be513fc22842db1e7f6f5e5f80cb1aa207e82a73fb8b7b412ed5d90fbd2cab4a +882d737b9e947476a2cb97a41e04553bcf8f3dffd41ef01409697950c0ff3302
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.