diff options
| author | Kyle McMartin <kyle@redhat.com> | 2013-08-02 11:22:55 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2013-08-02 11:22:55 -0400 |
| commit | b8530490d3eb66137b109525bee3f69961ae0361 (patch) | |
| tree | b9a7c4a15a8f1885b8d84f59f08be9c1437fc44c | |
| parent | c8491a786b324c1b8938c870e5c3390cdcd6f91c (diff) | |
| download | kernel-b8530490d3eb66137b109525bee3f69961ae0361.tar.gz kernel-b8530490d3eb66137b109525bee3f69961ae0361.tar.xz kernel-b8530490d3eb66137b109525bee3f69961ae0361.zip | |
radeon-si_calculate_leakage-use-div64.patch: fix compile error on i686
and some arm stuff
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-armv7 | 4 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | radeon-si_calculate_leakage-use-div64.patch | 13 |
4 files changed, 26 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic index 25144b506..9007b3c72 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -82,3 +82,5 @@ CONFIG_MDIO_GPIO=m # CONFIG_DRM_SHMOBILE is not set # CONFIG_MMC_DW_SOCFPGA is not set # CONFIG_ARM_SMMU is not set + +# CONFIG_LOCK_STAT is not set diff --git a/config-armv7 b/config-armv7 index 395a8a897..df8a264ba 100644 --- a/config-armv7 +++ b/config-armv7 @@ -198,8 +198,8 @@ CONFIG_MMC_OMAP=m CONFIG_MMC_OMAP_HS=m CONFIG_RTC_DRV_MAX8907=m # CONFIG_RTC_DRV_TWL92330 is not set -CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_OMAP=m +CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_OMAP=y # Note needs to be compiled in until we build MMC modular CONFIG_DMA_OMAP=m CONFIG_OMAP_IOVMM=m diff --git a/kernel.spec b/kernel.spec index dafe1d4e3..8eaab706d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -653,6 +653,7 @@ Patch1001: devel-sysrq-secure-boot-20130717.patch # virt + ksm patches # DRM +Patch1701: radeon-si_calculate_leakage-use-div64.patch #atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch #Patch1800: drm-vgem.patch @@ -1392,6 +1393,9 @@ ApplyPatch devel-sysrq-secure-boot-20130717.patch ApplyOptionalPatch drm-intel-next.patch ApplyPatch drm-i915-dp-stfu.patch +# Radeon DRM +ApplyPatch radeon-si_calculate_leakage-use-div64.patch + # silence the ACPI blacklist code ApplyPatch silence-acpi-blacklist.patch @@ -2258,6 +2262,11 @@ fi # ||----w | # || || %changelog +* Fri Aug 02 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc3.git2.1 +- radeon-si_calculate_leakage-use-div64.patch: fix a compile error on i686. +- arm: disable CONFIG_LOCK_STAT, bloats .data massively, revisit shortly. +- arm: build-in more rtc drivers. + * Fri Aug 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git2.1 - Linux v3.11-rc3-207-g64ccccf diff --git a/radeon-si_calculate_leakage-use-div64.patch b/radeon-si_calculate_leakage-use-div64.patch new file mode 100644 index 000000000..3c1e4b40b --- /dev/null +++ b/radeon-si_calculate_leakage-use-div64.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c +index 7ad22e8..4182557 100644 +--- a/drivers/gpu/drm/radeon/si_dpm.c ++++ b/drivers/gpu/drm/radeon/si_dpm.c +@@ -1767,7 +1767,7 @@ static void si_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coe + s64 temperature, t_slope, t_intercept, av, bv, t_ref; + s64 tmp; + +- i_leakage = drm_int2fixp(ileakage) / 100; ++ i_leakage = div64_s64(drm_int2fixp(ileakage), 100); + vddc = div64_s64(drm_int2fixp(v), 1000); + temperature = div64_s64(drm_int2fixp(t), 1000); + |