Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 7e650bbf authored by Robert Nelson's avatar Robert Nelson
Browse files

fix: add patch to fix building udlfb.ko: fixes: https://github.com/RobertCNelson/linux-dev/issues/7


Signed-off-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent 69e54d14
Branches
Tags
No related merge requests found
...@@ -130,6 +130,11 @@ mainline_fixes () { ...@@ -130,6 +130,11 @@ mainline_fixes () {
#Status: #Status:
#http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap.git;a=shortlog;h=refs/heads/devel-dt #http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap.git;a=shortlog;h=refs/heads/devel-dt
${git} "${DIR}/patches/mainline-fixes/0002-ARM-omap-add-dtb-targets.patch" ${git} "${DIR}/patches/mainline-fixes/0002-ARM-omap-add-dtb-targets.patch"
#From: https://github.com/RobertCNelson/linux-dev/issues/7
#DisplayLink fb driver (udlfb.ko)
#Status: https://patchwork.kernel.org/patch/1361471/
${git} "${DIR}/patches/mainline-fixes/0003-ARM-export-read_current_timer.patch"
} }
debug () { debug () {
......
...@@ -3118,7 +3118,7 @@ CONFIG_FB_TILEBLITTING=y ...@@ -3118,7 +3118,7 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_TMIO is not set # CONFIG_FB_TMIO is not set
# CONFIG_FB_SMSCUFX is not set # CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_UDL is not set CONFIG_FB_UDL=m
# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set # CONFIG_FB_METRONOME is not set
# CONFIG_FB_BROADSHEET is not set # CONFIG_FB_BROADSHEET is not set
......
From c9fb6f3d36ca8567c7d8770906f1f7144bdc6b97 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 22 Aug 2012 14:29:37 +0000
Subject: [PATCH 3/3] ARM: export read_current_timer
read_current_timer is used in the get_cycles() function when
ARM_ARCH_TIMER is set, and that function can be inlined into
driver modules, so we should export the function to avoid
errors like
ERROR: "read_current_timer" [drivers/video/udlfb.ko] undefined!
ERROR: "read_current_timer" [crypto/tcrypt.ko] undefined!
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
---
arch/arm/kernel/arch_timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index cf25880..6327d1f 100644
--- a/arch/arm/kernel/arch_timer.c
+++ b/arch/arm/kernel/arch_timer.c
@@ -14,6 +14,7 @@
#include <linux/device.h>
#include <linux/smp.h>
#include <linux/cpu.h>
+#include <linux/export.h>
#include <linux/jiffies.h>
#include <linux/clockchips.h>
#include <linux/interrupt.h>
@@ -232,6 +233,7 @@ int read_current_timer(unsigned long *timer_val)
*timer_val = arch_counter_get_cntpct();
return 0;
}
+EXPORT_SYMBOL_GPL(read_current_timer);
static struct clocksource clocksource_counter = {
.name = "arch_sys_counter",
--
1.7.10.4
...@@ -23,7 +23,7 @@ config="omap2plus_defconfig" ...@@ -23,7 +23,7 @@ config="omap2plus_defconfig"
#Kernel/Build #Kernel/Build
KERNEL_REL=3.6 KERNEL_REL=3.6
KERNEL_TAG=${KERNEL_REL}-rc7 KERNEL_TAG=${KERNEL_REL}-rc7
BUILD=d4.1 BUILD=d4.2
#git branch #git branch
#BRANCH= #BRANCH=
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment