mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-22 14:41:27 +00:00
Merge ../powerpc-merge
This commit is contained in:
commit
a00428f5b1
563 changed files with 7800 additions and 6850 deletions
|
@ -15,8 +15,8 @@
|
|||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
/**
|
||||
* __iowrite32_copy - copy data to MMIO space, in 32-bit units
|
||||
|
|
|
@ -38,6 +38,10 @@ static char *action_to_string(enum kobject_action action)
|
|||
return "remove";
|
||||
case KOBJ_CHANGE:
|
||||
return "change";
|
||||
case KOBJ_MOUNT:
|
||||
return "mount";
|
||||
case KOBJ_UMOUNT:
|
||||
return "umount";
|
||||
case KOBJ_OFFLINE:
|
||||
return "offline";
|
||||
case KOBJ_ONLINE:
|
||||
|
|
|
@ -752,12 +752,14 @@ void *radix_tree_delete(struct radix_tree_root *root, unsigned long index)
|
|||
*/
|
||||
nr_cleared_tags = 0;
|
||||
for (tag = 0; tag < RADIX_TREE_TAGS; tag++) {
|
||||
tags[tag] = 1;
|
||||
if (tag_get(pathp->node, tag, pathp->offset)) {
|
||||
tag_clear(pathp->node, tag, pathp->offset);
|
||||
tags[tag] = 0;
|
||||
nr_cleared_tags++;
|
||||
} else
|
||||
tags[tag] = 1;
|
||||
if (!any_tag_set(pathp->node, tag)) {
|
||||
tags[tag] = 0;
|
||||
nr_cleared_tags++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (pathp--; nr_cleared_tags && pathp->node; pathp--) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue