aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-10asm-generic/io.h: add reads[bwl]/writes[bwl] helpersMike Frysinger2-30/+30
A bunch of arches define reads[bwl]/writes[bwl] helpers for accessing memory mapped registers. Since the Blackfin ones aren't specific to Blackfin code, move them to the common asm-generic/io.h for people. Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10net/irda: bfin_sir: back out transitional definesMike Frysinger1-3/+0
Now that the common header is sane, we can drop the transitional cruft. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: bfin_serial.h: unify heavily duplicated serial codeMike Frysinger29-1024/+377
Each Blackfin port has been duplicating UART structures and defines when there really is no need for it. So start a new bfin_serial.h header to unify all these pieces and give ourselves a fresh start. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10net/irda: bfin_sir: pull in serial headers for definesMike Frysinger1-0/+5
We're in the process of cleaning up the global Blackfin namespace, so the bfin_sir driver needs to pull in the serial header explicitly now. This does add a little transitional cruft to keep things compiling, but a follow up patch in this series will cull that. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: musb-boards: push clkin value to platform resourcesBob Liu6-0/+6
In order to not touch the driver file for different xtal usage, push the clkin value to board file and calculate the register value instead of hardcoding it. Signed-off-by: Bob Liu <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: SMP: fix hotplug building after irq header shuffleGraf Yang1-0/+2
Signed-off-by: Graf Yang <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10nilfs2: unfold nilfs_dat_inode functionRyusuke Konishi7-30/+19
nilfs_dat_inode function was a wrapper to switch between normal dat inode and gcdat, a clone of the dat inode for garbage collection. This function got obsolete when the gcdat inode was removed, and now we can access the dat inode directly from a nilfs object. So, we will unfold the wrapper and remove it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: do not pass sbi to functions which can get it from inodeRyusuke Konishi4-17/+12
This removes argument for passing nilfs_sb_info structure from nilfs_set_file_dirty and nilfs_load_inode_block functions. We can get a pointer to the structure from inodes. [Stephen Rothwell <[email protected]>: fix conflict with commit b74c79e99389cd79b31fcc08f82c24e492e63c7e] Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: get rid of nilfs_mount_options structureRyusuke Konishi2-11/+3
Only mount_opt member is used in the nilfs_mount_options structure, and we can simplify it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: simplify nilfs_mdt_freeze_bufferRyusuke Konishi1-14/+12
nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer() always returns a valid buffer head, so its validity check can be removed. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: get rid of loaded flag from nilfs objectRyusuke Konishi2-4/+0
NILFS_LOADED flag of the nilfs object is not used now, so this will remove it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: fix a checkpatch error in page.cRyusuke Konishi1-1/+1
Will correct the following checkpatch error: ERROR: trailing whitespace #494: FILE: page.c:494: + $ Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: fiemap supportRyusuke Konishi6-0/+222
This adds fiemap to nilfs. Two new functions, nilfs_fiemap and nilfs_find_uncommitted_extent are added. nilfs_fiemap() implements the fiemap inode operation, and nilfs_find_uncommitted_extent() helps to get a range of data blocks whose physical location has not been determined. nilfs_fiemap() collects extent information by looping through nilfs_bmap_lookup_contig and nilfs_find_uncommitted_extent routines. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: mark buffer heads as delayed until the data is written to diskRyusuke Konishi2-0/+3
Nilfs does not allocate new blocks on disk until they are actually written to. To implement fiemap, we need to deal with such blocks. To allow successive fiemap patch to distinguish mapped but unallocated regions, this marks buffer heads of those new blocks as delayed and clears the flag after the blocks are written to disk. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: call nilfs_error inside bmap routinesRyusuke Konishi5-63/+48
Some functions using nilfs bmap routines can wrongly return invalid argument error (i.e. -EINVAL) that bmap returns as an internal code for btree corruption. This fixes the issue by catching and converting the internal EINVAL to EIO and calling nilfs_error function inside bmap routines. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10fs/nilfs2/super.c: Use printf extension %pVJoe Perches1-7/+16
Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10MAINTAINERS: add nilfs2 git tree entryRyusuke Konishi1-0/+1
NILFS2 filesystem section of the MAINTAINERS file lacks an entry of scm tree. This adds it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-09cifs: use CreationTime like an i_generation fieldJeff Layton4-0/+11
Reduce false inode collisions by using the CreationTime like an i_generation field. This way, even if the server ends up reusing a uniqueid after a delete/create cycle, we can avoid matching the inode incorrectly. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-01-10Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into nextJames Morris11-931/+944
2011-01-09cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfoJeff Layton2-8/+4
We call CIFSSMBUnixSetPathInfo in these functions, but we have a filehandle since an open was just done. Switch these functions to use CIFSSMBUnixSetFileInfo instead. In practice, these codepaths are only used if posix opens are broken. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-01-09cifs: show "acl" in DebugData Features when it's compiled inJeff Layton1-12/+10
...and while we're at it, reduce the number of calls into the seq_* functions by prepending spaces to strings. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-01-09cifs: move "ntlmssp" and "local_leases" options out of experimental codeJeff Layton3-68/+55
I see no real need to leave these sorts of options under an EXPERIMENTAL ifdef. Since you need a mount option to turn this code on, that only blows out the testing matrix. local_leases has been under the EXPERIMENTAL tag for some time, but it's only the mount option that's under this label. Move it out from under this tag. The NTLMSSP code is also under EXPERIMENTAL, but it needs a mount option to turn it on, and in the future any distro will reasonably want this enabled. Go ahead and move it out from under the EXPERIMENTAL tag. Signed-off-by: Jeff Layton <[email protected]> Acked-by: Suresh Jayaraman <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-01-09cifs: replace some hardcoded values with preprocessor constantsJeff Layton1-18/+19
A number of places that deal with RFC1001/1002 negotiations have bare "15" or "16" values. Replace them with RFC_1001_NAME_LEN and RFC_1001_NAME_LEN_WITH_NULL. The patch also cleans up some checkpatch warnings for code surrounding the changes. This should apply cleanly on top of the patch to remove Local_System_Name. Reported-and-Reviwed-by: Shirish Pargaonkar <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-01-09cifs: remove unnecessary locking around sequence_numberJeff Layton2-5/+3
The server->sequence_number is already protected by the srv_mutex. The GlobalMid_lock is unneeded here. Reviewed-by: Shirish Pargaonkar <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-01-09[CIFS] Fix minor merge conflict in fs/cifs/dir.cSteve French1-7/+0
Signed-off-by: Steve French <[email protected]>
2011-01-09Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French3838-152429/+287536
Conflicts: fs/cifs/dir.c
2011-01-10Merge branch 'master' into nextJames Morris4511-161161/+299399
Conflicts: security/smack/smack_lsm.c Verified and added fix by Stephen Rothwell <[email protected]> Ok'd by Casey Schaufler <[email protected]> Signed-off-by: James Morris <[email protected]>
2011-01-09hwmon: Support for Dallas Semiconductor DS620Roland Stigge5-0/+403
Driver for Dallas Semiconductor DS620 temperature sensor and thermostat Signed-off-by: Roland Stigge <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-09Merge branch 'slab/next' into for-linusPekka Enberg6-75/+89
2011-01-08of/flattree: forward declare struct device_node in of_fdt.hGrant Likely1-0/+2
This patch forward declares struct device_node to fix a compile error when of_fdt.h is included, but of.h is not. Alternately, including linux/of.h could have been added to of_fdt.h, but that pulls in a lot of unnecessary declarations when only working with the flattened form. Signed-off-by: Grant Likely <[email protected]>
2011-01-08hwmon: driver for Sensirion SHT21 humidity and temperature sensorUrs Fleisch4-0/+367
Signed-off-by: Urs Fleisch <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: Add humidity attribute to sysfs ABIGuenter Roeck1-0/+9
The humidity attribute is already supported by the sht15 driver, and another driver supporting it is about to be added. Make it official. Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Acked-by: Jean Delvare <[email protected]>
2011-01-08hwmon: sysfs ABI updatesGuenter Roeck1-7/+33
Add attributes supported by various PMBus devices to hwmon sysfs ABI. Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtempJan Beulich1-14/+11
Signed-off-by: Jan Beulich <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (lm95241) Rewrite to avoid using macrosDavide Rizzo1-262/+233
Signed-off-by: Davide Rizzo <[email protected]> [[email protected]: Formatting changes] Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Fix checkpatch errors and fix value range checksGuenter Roeck1-18/+16
This patch fixes all checkpatch errors and most of the checkpatch warnings. It also fixes the range check in applesmc_store_fan_speed(). Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Henrik Rydberg <[email protected]>
2011-01-08hwmon: (applesmc) Update copyright informationHenrik Rydberg1-0/+1
With the preceding patches, git blame assigns about half of the file to the present author. Add a line to the copyright to reflect this. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Silence driverHenrik Rydberg1-4/+0
Make the driver report a single line on success. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Simplify feature sysfs handlingHenrik Rydberg1-93/+76
Given the dynamic node construction method, the setup of the accelerometer, light sensor and keyboard backlight sysfs nodes can be simplified. This patch does not contain any logic changes. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Dynamic creation of fan filesHenrik Rydberg1-145/+43
With the dynamic temperature group in place, the setup of fans can be simplified. This patch sets up the fans dynamically, removing a hundred lines of code. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Extract all features genericallyHenrik Rydberg1-182/+59
With temperature keys being determined automatically, the dmi match data is only used to assign features that can easily be detected from the smc. This patch removes the dmi match data altogether, and reduces the match table to the main machine models. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Handle new temperature formatHenrik Rydberg1-3/+9
The recent Macbooks have temperature registers of a new type. This patch adds the logic to handle them. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Dynamic creation of temperature filesHenrik Rydberg1-389/+111
The current driver creates temperature files based on a list of temperature keys given per device. Apart from slow adaption to new machine models, the number of sensors also depends on the number of processors. This patch looks up the temperature keys dynamically, thereby supporting all models. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Introduce a register lookup tableHenrik Rydberg1-242/+297
One main problem with the current driver is the inability to quickly search for supported keys, resulting in detailed feature maps per machine model which are cumbersome to maintain. This patch adds a register lookup table, which enables binary search for supported keys. The lookup also reduces the io frequency, so the original mutex is replaced by locks around the actual io. Signed-off-by: Henrik Rydberg <[email protected]> [[email protected]: Added value range check to key_at_index_store()] Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Use pr_fmt and pr_<level>Joe Perches1-32/+26
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Relax the severity of device init failureHenrik Rydberg1-31/+7
The device init is used to reset the accelerometer. Failure to reset is not severe enough to stop loading the module or to resume from hibernation. This patch relaxes failure to a warning and drops output in case of success. Cc: [email protected] Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (applesmc) Add MacBookAir3,1(3,2) supportEdgar Hucek1-0/+10
This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the applesmc driver. [[email protected]: minor cleanup] Cc: [email protected] Signed-off-by: Edgar Hucek <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (w83627hf) Use pr_fmt and pr_<level>Joe Perches1-9/+8
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (w83627ehf) Use pr_fmt and pr_<level>Joe Perches1-13/+10
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (vt8231) Use pr_fmt and pr_<level>Joe Perches1-5/+5
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>