| Message ID | cover.1459732456.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
Hi, On Sun, Apr 3, 2016 at 6:22 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > From: Geert Uytterhoeven <geert+renesas@glider.be> > > Commit edf4100906044225 ("ARM: shmobile: sh7372 dtsi: Remove Legacy > file") removed the DTS for the last shmobile SoC with a Cortex A8 CPU > core (sh7372 aka SH-Mobile AP4). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/timer.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c > index 67d79f9c6bad..1fc7759feab1 100644 > --- a/arch/arm/mach-shmobile/timer.c > +++ b/arch/arm/mach-shmobile/timer.c > @@ -54,9 +54,7 @@ void __init shmobile_init_delay(void) > if (!of_property_read_u32(np, "clock-frequency", &freq)) > max_freq = max(max_freq, freq); > > - if (of_device_is_compatible(np, "arm,cortex-a8")) { > - div = 2; > - } else if (of_device_is_compatible(np, "arm,cortex-a9")) { > + if (of_device_is_compatible(np, "arm,cortex-a9")) { > div = 1; > } else if (of_device_is_compatible(np, "arm,cortex-a7") || > of_device_is_compatible(np, "arm,cortex-a15")) { This setting of div doesn't make much sense now. It's always 1. This function seems more complicated than it has to be... -Olof
On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > Please consider these Renesas ARM based SoC drivers updates for v4.7. > > > The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: > > Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-drivers-for-v4.7 > > for you to fetch changes up to cd89841fc6dbb6dc11aa113769f39dcd30be720f: > > ARM: shmobile: timer: Drop support for Cortex A8 (2016-03-28 09:01:31 +0900) > > ---------------------------------------------------------------- > Renesas ARM Based SoC Drivers Updates for v4.7 > > Loop delay calculation updates: > * Remove check for no longer supported Cortex A8 cores > * Correct short calculation of delay > > ---------------------------------------------------------------- > Geert Uytterhoeven (2): > ARM: shmobile: timer: Fix preset_lpj leading to too short delays > ARM: shmobile: timer: Drop support for Cortex A8 I don't understand your naming. THis isn't driver code, this is SoC code. Anyway, I replied to the drop-A8 patch, the resulting function doesn't make much sense once that code path is removed (div is always 1). Seems like this should be cleaned up in other ways instead. So, not merging this branch for now since I think it should be revisited. -Olof
Hi Olof, On Wed, Apr 13, 2016 at 9:41 PM, Olof Johansson <olof@lixom.net> wrote: > On Sun, Apr 3, 2016 at 6:22 PM, Simon Horman <horms+renesas@verge.net.au> wrote: >> From: Geert Uytterhoeven <geert+renesas@glider.be> >> >> Commit edf4100906044225 ("ARM: shmobile: sh7372 dtsi: Remove Legacy >> file") removed the DTS for the last shmobile SoC with a Cortex A8 CPU >> core (sh7372 aka SH-Mobile AP4). >> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >> --- >> arch/arm/mach-shmobile/timer.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c >> index 67d79f9c6bad..1fc7759feab1 100644 >> --- a/arch/arm/mach-shmobile/timer.c >> +++ b/arch/arm/mach-shmobile/timer.c >> @@ -54,9 +54,7 @@ void __init shmobile_init_delay(void) >> if (!of_property_read_u32(np, "clock-frequency", &freq)) >> max_freq = max(max_freq, freq); >> >> - if (of_device_is_compatible(np, "arm,cortex-a8")) { >> - div = 2; >> - } else if (of_device_is_compatible(np, "arm,cortex-a9")) { >> + if (of_device_is_compatible(np, "arm,cortex-a9")) { >> div = 1; >> } else if (of_device_is_compatible(np, "arm,cortex-a7") || >> of_device_is_compatible(np, "arm,cortex-a15")) { > > This setting of div doesn't make much sense now. It's always 1. This > function seems more complicated than it has to be... Yes, there are definitely more areas for improvement in this organic piece of code... Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Olof, On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: >> Please consider these Renesas ARM based SoC drivers updates for v4.7. >> >> >> The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: >> >> Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-drivers-for-v4.7 >> >> for you to fetch changes up to cd89841fc6dbb6dc11aa113769f39dcd30be720f: >> >> ARM: shmobile: timer: Drop support for Cortex A8 (2016-03-28 09:01:31 +0900) >> >> ---------------------------------------------------------------- >> Renesas ARM Based SoC Drivers Updates for v4.7 >> >> Loop delay calculation updates: >> * Remove check for no longer supported Cortex A8 cores >> * Correct short calculation of delay >> >> ---------------------------------------------------------------- >> Geert Uytterhoeven (2): >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays >> ARM: shmobile: timer: Drop support for Cortex A8 > > I don't understand your naming. THis isn't driver code, this is SoC code. > > Anyway, I replied to the drop-A8 patch, the resulting function doesn't make > much sense once that code path is removed (div is always 1). Seems like this > should be cleaned up in other ways instead. > > So, not merging this branch for now since I think it should be revisited. The reason these are small separate patches is because especially the first one may be backported to stable, as it's a real bug fix. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: > Hi Olof, > > On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: > > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: > >> Please consider these Renesas ARM based SoC drivers updates for v4.7. > >> > >> > >> The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: > >> > >> Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) > >> > >> are available in the git repository at: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-drivers-for-v4.7 > >> > >> for you to fetch changes up to cd89841fc6dbb6dc11aa113769f39dcd30be720f: > >> > >> ARM: shmobile: timer: Drop support for Cortex A8 (2016-03-28 09:01:31 +0900) > >> > >> ---------------------------------------------------------------- > >> Renesas ARM Based SoC Drivers Updates for v4.7 > >> > >> Loop delay calculation updates: > >> * Remove check for no longer supported Cortex A8 cores > >> * Correct short calculation of delay > >> > >> ---------------------------------------------------------------- > >> Geert Uytterhoeven (2): > >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays > >> ARM: shmobile: timer: Drop support for Cortex A8 > > > > I don't understand your naming. THis isn't driver code, this is SoC code. > > > > Anyway, I replied to the drop-A8 patch, the resulting function doesn't make > > much sense once that code path is removed (div is always 1). Seems like this > > should be cleaned up in other ways instead. > > > > So, not merging this branch for now since I think it should be revisited. > > The reason these are small separate patches is because especially the > first one may be backported to stable, as it's a real bug fix. Ok, so then the second shouldn't just remove cortex-a8, but rework the function (yet again). -Olof
Hi Olof,Simon, On Wed, Apr 13, 2016 at 10:23 PM, Olof Johansson <olof@lixom.net> wrote: > On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: >> On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: >> > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: >> >> Geert Uytterhoeven (2): >> >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays >> >> ARM: shmobile: timer: Drop support for Cortex A8 >> > >> > I don't understand your naming. THis isn't driver code, this is SoC code. >> > >> > Anyway, I replied to the drop-A8 patch, the resulting function doesn't make >> > much sense once that code path is removed (div is always 1). Seems like this >> > should be cleaned up in other ways instead. >> > >> > So, not merging this branch for now since I think it should be revisited. >> >> The reason these are small separate patches is because especially the >> first one may be backported to stable, as it's a real bug fix. > > Ok, so then the second shouldn't just remove cortex-a8, but rework the function > (yet again). Sure, reworking it... Simon: I'm a bit surprised to see that "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" got postponed to v4.7, while commit 406663ed61c8 ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") is already in v4.6-rc1. The latter makes bad behavior due to too short delays more likely to happen. Sorry for not noticing before. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Thu, Apr 14, 2016 at 10:19:04AM +0200, Geert Uytterhoeven wrote: > Hi Olof,Simon, > > On Wed, Apr 13, 2016 at 10:23 PM, Olof Johansson <olof@lixom.net> wrote: > > On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: > >> On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: > >> > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: > >> >> Geert Uytterhoeven (2): > >> >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays > >> >> ARM: shmobile: timer: Drop support for Cortex A8 > >> > > >> > I don't understand your naming. THis isn't driver code, this is SoC code. > >> > > >> > Anyway, I replied to the drop-A8 patch, the resulting function doesn't make > >> > much sense once that code path is removed (div is always 1). Seems like this > >> > should be cleaned up in other ways instead. > >> > > >> > So, not merging this branch for now since I think it should be revisited. > >> > >> The reason these are small separate patches is because especially the > >> first one may be backported to stable, as it's a real bug fix. > > > > Ok, so then the second shouldn't just remove cortex-a8, but rework the function > > (yet again). > > Sure, reworking it... > > Simon: I'm a bit surprised to see that "ARM: shmobile: timer: Fix preset_lpj > leading to too short delays" got postponed to v4.7, while commit 406663ed61c8 > ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") is > already in v4.6-rc1. The latter makes bad behavior due to too short delays > more likely to happen. > > Sorry for not noticing before. Likewise, sorry for the mix-up. I can think of two ways to resolve this, likely there are others: 1. Submit "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" or conversely 2. Submit a reversion of 406663ed61c8 ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") as a fix for v4.6. Or perhaps it is a problem that can just be ironed out in v4.7. Let me know what you think.
Hi Simon, On Fri, Apr 15, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote: > On Thu, Apr 14, 2016 at 10:19:04AM +0200, Geert Uytterhoeven wrote: >> On Wed, Apr 13, 2016 at 10:23 PM, Olof Johansson <olof@lixom.net> wrote: >> > On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: >> >> On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: >> >> > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: >> >> >> Geert Uytterhoeven (2): >> >> >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays >> >> >> ARM: shmobile: timer: Drop support for Cortex A8 >> Simon: I'm a bit surprised to see that "ARM: shmobile: timer: Fix preset_lpj >> leading to too short delays" got postponed to v4.7, while commit 406663ed61c8 >> ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") is >> already in v4.6-rc1. The latter makes bad behavior due to too short delays >> more likely to happen. >> >> Sorry for not noticing before. > > Likewise, sorry for the mix-up. > > I can think of two ways to resolve this, likely there are others: > 1. Submit "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" > or conversely > 2. Submit a reversion of 406663ed61c8 ("ARM: shmobile: defconfig: Do not > enable CONFIG_CPU_BPREDICT_DISABLE") as a fix for v4.6. > > Or perhaps it is a problem that can just be ironed out in v4.7. > Let me know what you think. I prefer option 1, i.e. fixing the bug instead of papering over it in the defconfig. Users may not use the defconfig, and have CONFIG_CPU_BPREDICT_DISABLE enabled anyway. Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Fri, Apr 15, 2016 at 08:35:48AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Fri, Apr 15, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote: > > On Thu, Apr 14, 2016 at 10:19:04AM +0200, Geert Uytterhoeven wrote: > >> On Wed, Apr 13, 2016 at 10:23 PM, Olof Johansson <olof@lixom.net> wrote: > >> > On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: > >> >> On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: > >> >> > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: > >> >> >> Geert Uytterhoeven (2): > >> >> >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays > >> >> >> ARM: shmobile: timer: Drop support for Cortex A8 > > >> Simon: I'm a bit surprised to see that "ARM: shmobile: timer: Fix preset_lpj > >> leading to too short delays" got postponed to v4.7, while commit 406663ed61c8 > >> ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") is > >> already in v4.6-rc1. The latter makes bad behavior due to too short delays > >> more likely to happen. > >> > >> Sorry for not noticing before. > > > > Likewise, sorry for the mix-up. > > > > I can think of two ways to resolve this, likely there are others: > > 1. Submit "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" > > or conversely > > 2. Submit a reversion of 406663ed61c8 ("ARM: shmobile: defconfig: Do not > > enable CONFIG_CPU_BPREDICT_DISABLE") as a fix for v4.6. > > > > Or perhaps it is a problem that can just be ironed out in v4.7. > > Let me know what you think. > > I prefer option 1, i.e. fixing the bug instead of papering over it in > the defconfig. > Users may not use the defconfig, and have CONFIG_CPU_BPREDICT_DISABLE > enabled anyway. Thanks, that reasoning sounds fine to me. I plan to re-queue "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" in fixes-for-v4.6 and I plan to push that in a revised renesas-next tag later today. I would appreciate you double checking that all is in order.
Hi Simon, On Mon, Apr 18, 2016 at 5:55 AM, Simon Horman <horms@verge.net.au> wrote: > On Fri, Apr 15, 2016 at 08:35:48AM +0200, Geert Uytterhoeven wrote: >> On Fri, Apr 15, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote: >> > On Thu, Apr 14, 2016 at 10:19:04AM +0200, Geert Uytterhoeven wrote: >> >> On Wed, Apr 13, 2016 at 10:23 PM, Olof Johansson <olof@lixom.net> wrote: >> >> > On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: >> >> >> On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: >> >> >> > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: >> >> >> >> Geert Uytterhoeven (2): >> >> >> >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays >> >> >> >> ARM: shmobile: timer: Drop support for Cortex A8 >> >> >> Simon: I'm a bit surprised to see that "ARM: shmobile: timer: Fix preset_lpj >> >> leading to too short delays" got postponed to v4.7, while commit 406663ed61c8 >> >> ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") is >> >> already in v4.6-rc1. The latter makes bad behavior due to too short delays >> >> more likely to happen. >> >> >> >> Sorry for not noticing before. >> > >> > Likewise, sorry for the mix-up. >> > >> > I can think of two ways to resolve this, likely there are others: >> > 1. Submit "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" >> > or conversely >> > 2. Submit a reversion of 406663ed61c8 ("ARM: shmobile: defconfig: Do not >> > enable CONFIG_CPU_BPREDICT_DISABLE") as a fix for v4.6. >> > >> > Or perhaps it is a problem that can just be ironed out in v4.7. >> > Let me know what you think. >> >> I prefer option 1, i.e. fixing the bug instead of papering over it in >> the defconfig. >> Users may not use the defconfig, and have CONFIG_CPU_BPREDICT_DISABLE >> enabled anyway. > > Thanks, that reasoning sounds fine to me. > > I plan to re-queue "ARM: shmobile: timer: Fix preset_lpj leading to too > short delays" in fixes-for-v4.6 and I plan to push that in a revised > renesas-next tag later today. I would appreciate you double checking that > all is in order. Thanks, that commit looks fine! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tue, Apr 19, 2016 at 09:25:20AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Mon, Apr 18, 2016 at 5:55 AM, Simon Horman <horms@verge.net.au> wrote: > > On Fri, Apr 15, 2016 at 08:35:48AM +0200, Geert Uytterhoeven wrote: > >> On Fri, Apr 15, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote: > >> > On Thu, Apr 14, 2016 at 10:19:04AM +0200, Geert Uytterhoeven wrote: > >> >> On Wed, Apr 13, 2016 at 10:23 PM, Olof Johansson <olof@lixom.net> wrote: > >> >> > On Wed, Apr 13, 2016 at 09:57:39PM +0200, Geert Uytterhoeven wrote: > >> >> >> On Wed, Apr 13, 2016 at 9:43 PM, Olof Johansson <olof@lixom.net> wrote: > >> >> >> > On Mon, Apr 04, 2016 at 10:22:56AM +0900, Simon Horman wrote: > >> >> >> >> Geert Uytterhoeven (2): > >> >> >> >> ARM: shmobile: timer: Fix preset_lpj leading to too short delays > >> >> >> >> ARM: shmobile: timer: Drop support for Cortex A8 > >> > >> >> Simon: I'm a bit surprised to see that "ARM: shmobile: timer: Fix preset_lpj > >> >> leading to too short delays" got postponed to v4.7, while commit 406663ed61c8 > >> >> ("ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE") is > >> >> already in v4.6-rc1. The latter makes bad behavior due to too short delays > >> >> more likely to happen. > >> >> > >> >> Sorry for not noticing before. > >> > > >> > Likewise, sorry for the mix-up. > >> > > >> > I can think of two ways to resolve this, likely there are others: > >> > 1. Submit "ARM: shmobile: timer: Fix preset_lpj leading to too short delays" > >> > or conversely > >> > 2. Submit a reversion of 406663ed61c8 ("ARM: shmobile: defconfig: Do not > >> > enable CONFIG_CPU_BPREDICT_DISABLE") as a fix for v4.6. > >> > > >> > Or perhaps it is a problem that can just be ironed out in v4.7. > >> > Let me know what you think. > >> > >> I prefer option 1, i.e. fixing the bug instead of papering over it in > >> the defconfig. > >> Users may not use the defconfig, and have CONFIG_CPU_BPREDICT_DISABLE > >> enabled anyway. > > > > Thanks, that reasoning sounds fine to me. > > > > I plan to re-queue "ARM: shmobile: timer: Fix preset_lpj leading to too > > short delays" in fixes-for-v4.6 and I plan to push that in a revised > > renesas-next tag later today. I would appreciate you double checking that > > all is in order. > > Thanks, that commit looks fine! Great, thanks for checking.
Hi Olof, Hi Kevin, Hi Arnd, Please consider these Renesas ARM based SoC drivers updates for v4.7. The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-drivers-for-v4.7 for you to fetch changes up to cd89841fc6dbb6dc11aa113769f39dcd30be720f: ARM: shmobile: timer: Drop support for Cortex A8 (2016-03-28 09:01:31 +0900) ---------------------------------------------------------------- Renesas ARM Based SoC Drivers Updates for v4.7 Loop delay calculation updates: * Remove check for no longer supported Cortex A8 cores * Correct short calculation of delay ---------------------------------------------------------------- Geert Uytterhoeven (2): ARM: shmobile: timer: Fix preset_lpj leading to too short delays ARM: shmobile: timer: Drop support for Cortex A8 arch/arm/mach-shmobile/timer.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)