| Message ID | 1354890500-32132-1-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 12/07/2012 10:28 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > An earlier patch removed FWTS_TEST_VGA_REGION but I forgot to also > remove mtrr_test4. Remove this unwanted and broken old test. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/bios/mtrr/mtrr.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c > index 285d284..18d542b 100644 > --- a/src/bios/mtrr/mtrr.c > +++ b/src/bios/mtrr/mtrr.c > @@ -505,20 +505,10 @@ static int mtrr_test3(fwts_framework *fw) > return FWTS_OK; > } > > -#if FWTS_TEST_VGA_REGION > -static int mtrr_test4(fwts_framework *fw) > -{ > - return check_vga_controller_address(fw); > -} > -#endif > - > static fwts_framework_minor_test mtrr_tests[] = { > { mtrr_test1, "Validate the kernel MTRR IOMEM setup." }, > { mtrr_test2, "Validate the MTRR setup across all processors." }, > { mtrr_test3, "Check for AMD MtrrFixDramModEn being cleared by the BIOS." }, > -#if FWTS_TEST_VGA_REGION > - { mtrr_test4, "Validate the BIOS providided boot time MTRR IOMEM setup." }, > -#endif > { NULL, NULL } > }; > > Acked-by: Ivan Hu <ivan.hu@canonical.com>
On Fri, Dec 7, 2012 at 10:28 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > An earlier patch removed FWTS_TEST_VGA_REGION but I forgot to also > remove mtrr_test4. Remove this unwanted and broken old test. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/bios/mtrr/mtrr.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c > index 285d284..18d542b 100644 > --- a/src/bios/mtrr/mtrr.c > +++ b/src/bios/mtrr/mtrr.c > @@ -505,20 +505,10 @@ static int mtrr_test3(fwts_framework *fw) > return FWTS_OK; > } > > -#if FWTS_TEST_VGA_REGION > -static int mtrr_test4(fwts_framework *fw) > -{ > - return check_vga_controller_address(fw); > -} > -#endif > - > static fwts_framework_minor_test mtrr_tests[] = { > { mtrr_test1, "Validate the kernel MTRR IOMEM setup." }, > { mtrr_test2, "Validate the MTRR setup across all processors." }, > { mtrr_test3, "Check for AMD MtrrFixDramModEn being cleared by the BIOS." }, > -#if FWTS_TEST_VGA_REGION > - { mtrr_test4, "Validate the BIOS providided boot time MTRR IOMEM setup." }, > -#endif > { NULL, NULL } > }; > > -- > 1.8.0 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c index 285d284..18d542b 100644 --- a/src/bios/mtrr/mtrr.c +++ b/src/bios/mtrr/mtrr.c @@ -505,20 +505,10 @@ static int mtrr_test3(fwts_framework *fw) return FWTS_OK; } -#if FWTS_TEST_VGA_REGION -static int mtrr_test4(fwts_framework *fw) -{ - return check_vga_controller_address(fw); -} -#endif - static fwts_framework_minor_test mtrr_tests[] = { { mtrr_test1, "Validate the kernel MTRR IOMEM setup." }, { mtrr_test2, "Validate the MTRR setup across all processors." }, { mtrr_test3, "Check for AMD MtrrFixDramModEn being cleared by the BIOS." }, -#if FWTS_TEST_VGA_REGION - { mtrr_test4, "Validate the BIOS providided boot time MTRR IOMEM setup." }, -#endif { NULL, NULL } };