Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
+14
-12
+4
-2
Documentation/aoe/mkshelf.sh
+4
-2
Documentation/aoe/mkshelf.sh
···
8
8
n_partitions=${n_partitions:-16}
9
9
dir=$1
10
10
shelf=$2
11
+
nslots=16
12
+
maxslot=`echo $nslots 1 - p | dc`
11
13
MAJOR=152
12
14
13
15
set -e
14
16
15
-
minor=`echo 10 \* $shelf \* $n_partitions | bc`
17
+
minor=`echo $nslots \* $shelf \* $n_partitions | bc`
16
18
endp=`echo $n_partitions - 1 | bc`
17
-
for slot in `seq 0 9`; do
19
+
for slot in `seq 0 $maxslot`; do
18
20
for part in `seq 0 $endp`; do
19
21
name=e$shelf.$slot
20
22
test "$part" != "0" && name=${name}p$part
+4
-4
Documentation/firmware_class/firmware_sample_driver.c
+4
-4
Documentation/firmware_class/firmware_sample_driver.c
···
32
32
u8 buf[size+1];
33
33
memcpy(buf, firmware, size);
34
34
buf[size] = '\0';
35
-
printk("firmware_sample_driver: firmware: %s\n", buf);
35
+
printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
36
36
}
37
37
38
38
static void sample_probe_default(void)
39
39
{
40
40
/* uses the default method to get the firmware */
41
41
const struct firmware *fw_entry;
42
-
printk("firmware_sample_driver: a ghost device got inserted :)\n");
42
+
printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
43
43
44
44
if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
45
45
{
···
61
61
62
62
/* NOTE: This currently doesn't work */
63
63
64
-
printk("firmware_sample_driver: a ghost device got inserted :)\n");
64
+
printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
65
65
66
66
if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
67
67
{
···
83
83
return;
84
84
}
85
85
86
-
printk("firmware_sample_driver: device pointer \"%s\"\n",
86
+
printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
87
87
(char *)context);
88
88
sample_firmware_load(fw->data, fw->size);
89
89
}
+6
-6
drivers/block/aoe/aoe.h
+6
-6
drivers/block/aoe/aoe.h
···
1
1
/* Copyright (c) 2004 Coraid, Inc. See COPYING for GPL terms. */
2
-
#define VERSION "10"
2
+
#define VERSION "12"
3
3
#define AOE_MAJOR 152
4
4
#define DEVICE_NAME "aoe"
5
5
···
7
7
* default is 16, which is 15 partitions plus the whole disk
8
8
*/
9
9
#ifndef AOE_PARTITIONS
10
-
#define AOE_PARTITIONS 16
10
+
#define AOE_PARTITIONS (16)
11
11
#endif
12
12
13
-
#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * 10 + (aoeminor))
14
-
#define AOEMAJOR(sysminor) ((sysminor) / 10)
15
-
#define AOEMINOR(sysminor) ((sysminor) % 10)
13
+
#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))
14
+
#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)
15
+
#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)
16
16
#define WHITESPACE " \t\v\f\n"
17
17
18
18
enum {
···
83
83
84
84
enum {
85
85
MAXATADATA = 1024,
86
-
NPERSHELF = 10,
86
+
NPERSHELF = 16, /* number of slots per shelf address */
87
87
FREETAG = -1,
88
88
MIN_BUFS = 8,
89
89
};