Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

diff --git a/doc/notes.org b/doc/notes.org
index ff72316f219de11006130206883a2e1a7ea48a6e..d25de88ffb200cc1d31a61067b9f01d3bb19951f 100644 (file)
--- a/doc/notes.org
+++ b/doc/notes.org
@@ -10,7 +10,10 @@
  set bootcmd 'run bootcmd_tftpnfs_static'
 
 * Questions
-** Why crc modification alone does not produce an error and is not returned by cangw -L? 
+** Why crc modification alone does not produce an error and is not returned by cangw -L?
+** Why two simultaneous latesters return ENOBUFS even if txqueue is set high?
+latester -d can0
+latester -d can1
 * Kernel oops
 ** Linux-2.6.33.7-00005-ge2f49b5 
 Unable to handle kernel paging request for instruction fetch

diff --git a/kernel/2.6.33 b/kernel/2.6.33
index e2f49b5021a59d63b41663411925e621ca86c79a..9c0ff901fc0ca801fa76e14d04165bf57bef8441 160000 (submodule)
--- a/kernel/2.6.33
+++ b/kernel/2.6.33
@@ -1 +1 @@
-Subproject commit e2f49b5021a59d63b41663411925e621ca86c79a
+Subproject commit 9c0ff901fc0ca801fa76e14d04165bf57bef8441

diff --git a/kernel/2.6.36 b/kernel/2.6.36
index 9d89160865caa014cea0d4ac472b592e4b6b3fa3..4f1bc4e14b94fb7d1e8788ed29e3a2aa31ebff2d 160000 (submodule)
--- a/kernel/2.6.36
+++ b/kernel/2.6.36
@@ -1 +1 @@
-Subproject commit 9d89160865caa014cea0d4ac472b592e4b6b3fa3
+Subproject commit 4f1bc4e14b94fb7d1e8788ed29e3a2aa31ebff2d

diff --git a/kernel/build/glab-2.6.36/.config b/kernel/build/glab-2.6.36/.config
index 7d0068edbda4a1db92bf443622f7ca9c32a96acc..494c52a01e84fd313466da3a80e14ee172e5ffc2 100644 (file)
--- a/kernel/build/glab-2.6.36/.config
+++ b/kernel/build/glab-2.6.36/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36.1
-# Sat Dec  4 13:19:00 2010
+# Linux kernel version: 2.6.36.2
+# Fri Dec 10 08:52:57 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -69,7 +69,7 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -102,8 +102,7 @@ CONFIG_RCU_FANOUT=32
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -154,8 +153,7 @@ CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+# CONFIG_OPROFILE is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -312,7 +310,7 @@ CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_AMD is not set
 # CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
@@ -792,6 +790,7 @@ CONFIG_NET_PKTGEN=m
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
+# CONFIG_CAN_GW is not set
 
 #
 # CAN Device Drivers
@@ -1490,8 +1489,8 @@ CONFIG_SLHC=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
-# CONFIG_NETCONSOLE_DYNAMIC is not set
+CONFIG_NETCONSOLE=y
+CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
@@ -2553,7 +2552,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -2673,13 +2672,13 @@ CONFIG_DLM_DEBUG=y
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
@@ -2691,13 +2690,13 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
-CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -2724,8 +2723,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_DETECTOR=y
-CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -2749,7 +2747,6 @@ CONFIG_RING_BUFFER=y
 CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y

diff --git a/kernel/build/glab-2.6.36/GNUmakefile b/kernel/build/glab-2.6.36/GNUmakefile
index 48e0a519d82d4be3dbd2aa789114fdcba495260e..d0c32693a63ed26f1f2fd03076a29ded8a1e21c0 100644 (file)
--- a/kernel/build/glab-2.6.36/GNUmakefile
+++ b/kernel/build/glab-2.6.36/GNUmakefile
@@ -15,11 +15,14 @@ MAKEFLAGS += --no-print-directory
 
 all    := $(filter-out all Makefile,$(MAKECMDGOALS))
 
+KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
+
+
 all:
        $(MAKE) $(MAKEARGS) $(all) ARCH=i386
 ifeq ($(all),targz-pkg)
-       scp linux-2.6.36.1.tar.gz root@glab:
-       ssh root@glab 'tar -C / -xf linux-2.6.36.1.tar.gz; depmod 2.6.36.1'
+       scp linux-$(KERNELRELEASE).tar.gz root@glab:
+       ssh root@glab 'tar -C / -xf linux-$(KERNELRELEASE).tar.gz; depmod $(KERNELRELEASE)'
 endif
 
 

diff --git a/kernel/build/shark/2.6.33/.config b/kernel/build/shark/2.6.33/.config
index 975b613e84e3a1e7a3fbe33f242f662445ea4da1..05148208d5af0df8a31c876a1b873466d789b2fc 100644 (file)
--- a/kernel/build/shark/2.6.33/.config
+++ b/kernel/build/shark/2.6.33/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33.7
-# Wed Oct 27 10:14:31 2010
+# Mon Dec  6 18:41:52 2010
 #
 # CONFIG_PPC64 is not set
 
@@ -1212,7 +1212,7 @@ CONFIG_GENERIC_ATOMIC64=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y

diff --git a/kernel/build/shark/2.6.36/.config b/kernel/build/shark/2.6.36/.config
index 81dbe0f9d99029d2433bd33ab4abacf685d80d5f..e4d3fe54d82fe80909a7392e28584daf1fe671ae 100644 (file)
--- a/kernel/build/shark/2.6.36/.config
+++ b/kernel/build/shark/2.6.36/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36.1
-# Mon Dec  6 14:35:27 2010
+# Linux kernel version: 2.6.36.2
+# Fri Dec 10 16:58:52 2010
 #
 # CONFIG_PPC64 is not set
 
@@ -110,7 +110,6 @@ CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
@@ -461,8 +460,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
@@ -781,7 +778,6 @@ CONFIG_NVRAM=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
 #
@@ -1229,52 +1225,15 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-CONFIG_DEBUG_PREEMPT=y
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1307,19 +1266,11 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
 # CONFIG_PPC_DISABLE_WERROR is not set
 CONFIG_PPC_WERROR=y
 CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-# CONFIG_XMON is not set
 # CONFIG_VIRQ_DEBUG is not set
-# CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set